From 301bb123f424954cd3faee11bbbfb0605e5ae0e8 Mon Sep 17 00:00:00 2001
From: Joseph Rafael Ferrer <rafael2x0@gmail.com>
Date: Fri, 30 Oct 2020 18:19:56 +0800
Subject: [PATCH] Enable LLVM Polly via llvm-args.
---
config.toml.example | 3 +++
src/bootstrap/config.rs | 4 ++++
src/bootstrap/native.rs | 4 ++++
3 files changed, 11 insertions(+)
diff --git a/config.toml.example b/config.toml.example
index 1edb390e0fef2..1dcc5f13415dc 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -138,6 +138,9 @@ changelog-seen = 2
# Whether or not to specify `-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=YES`
#allow-old-toolchain = false
+# Whether to include the Polly optimizer.
+#polly = false
+
# =============================================================================
# General build configuration options
# =============================================================================
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 7698ff62880d6..8f6fbaebd2c5a 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -99,6 +99,7 @@ pub struct Config {
pub llvm_version_suffix: Option<String>,
pub llvm_use_linker: Option<String>,
pub llvm_allow_old_toolchain: Option<bool>,
+ pub llvm_polly: Option<bool>,
pub llvm_from_ci: bool,
pub use_lld: bool,
@@ -418,6 +419,7 @@ struct Llvm {
use_libcxx: Option<bool>,
use_linker: Option<String>,
allow_old_toolchain: Option<bool>,
+ polly: Option<bool>,
download_ci_llvm: Option<StringOrBool>,
}
@@ -762,6 +764,7 @@ impl Config {
set(&mut config.llvm_use_libcxx, llvm.use_libcxx);
config.llvm_use_linker = llvm.use_linker.clone();
config.llvm_allow_old_toolchain = llvm.allow_old_toolchain;
+ config.llvm_polly = llvm.polly;
config.llvm_from_ci = match llvm.download_ci_llvm {
Some(StringOrBool::String(s)) => {
assert!(s == "if-available", "unknown option `{}` for download-ci-llvm", s);
@@ -795,6 +798,7 @@ impl Config {
check_ci_llvm!(llvm.use_libcxx);
check_ci_llvm!(llvm.use_linker);
check_ci_llvm!(llvm.allow_old_toolchain);
+ check_ci_llvm!(llvm.polly);
// CI-built LLVM is shared
config.llvm_link_shared = true;
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index 37d6fab070b8e..6dc83c7d70af6 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -257,6 +257,10 @@ impl Step for Llvm {
enabled_llvm_projects.push("compiler-rt");
}
+ if let Some(true) = builder.config.llvm_polly {
+ enabled_llvm_projects.push("polly");
+ }
+
// We want libxml to be disabled.
// See https://github.com/rust-lang/rust/pull/50104
cfg.define("LLVM_ENABLE_LIBXML2", "OFF");