feature flags

Author: brandonros

crates/cuda_builder/Cargo.toml

@@ -8,9 +8,14 @@ description = "Builder for easily building rustc_codegen_nvvm crates"
 repository = "https://github.com/Rust-GPU/Rust-CUDA"
 readme = "../../README.md"
 
+[features]
+default = ["nvvm-v19"]
+nvvm-v7 = ["dep:rustc_codegen_nvvm_v7"]
+nvvm-v19 = ["dep:rustc_codegen_nvvm_v19"]
+
 [dependencies]
-rustc_codegen_nvvm_v7 = { version = "0.3", path = "../rustc_codegen_nvvm_v7" }
-rustc_codegen_nvvm_v19 = { version = "0.3", path = "../rustc_codegen_nvvm_v19" }
+rustc_codegen_nvvm_v7 = { version = "0.3", path = "../rustc_codegen_nvvm_v7", optional = true }
+rustc_codegen_nvvm_v19 = { version = "0.3", path = "../rustc_codegen_nvvm_v19", optional = true }
 nvvm = { path = "../nvvm", version = "0.1" }
 serde = { version = "1.0.217", features = ["derive"] }
-serde_json = "1.0.138"
+serde_json = "1.0.138"

crates/cuda_builder/src/lib.rs

@@ -162,7 +162,13 @@ impl CudaBuilder {
             ptx_file_copy_path: None,
             generate_line_info: true,
             nvvm_opts: true,
-            arch: NvvmArch::Compute61,
+            arch: if cfg!(feature = "nvvm-v19") {
+                NvvmArch::Compute100
+            } else if cfg!(feature = "nvvm-v7") {
+                NvvmArch::default()
+            } else {
+                panic!("No NVVM version feature enabled. Enable either 'nvvm-v7' or 'nvvm-v19'");
+            },
             ftz: false,
             fast_sqrt: false,
             fast_div: false,
@@ -358,17 +364,29 @@ fn dylib_path() -> Vec<PathBuf> {
 }
 
 fn find_rustc_codegen_nvvm() -> PathBuf {
+    // Determine which version to look for based on enabled features
+    let version_suffix = if cfg!(feature = "nvvm-v19") {
+        "_v19"
+    } else if cfg!(feature = "nvvm-v7") {
+        "_v7"
+    } else {
+        panic!("No NVVM version feature enabled. Enable either 'nvvm-v7' or 'nvvm-v19'");
+    };
+
     let filename = format!(
-        "{}rustc_codegen_nvvm{}",
+        "{}rustc_codegen_nvvm{}{}",
         env::consts::DLL_PREFIX,
+        version_suffix,
         env::consts::DLL_SUFFIX
     );
+    
     for mut path in dylib_path() {
         path.push(&filename);
         if path.is_file() {
             return path;
         }
     }
+    
     panic!("Could not find {} in library path", filename);
 }
 

crates/rustc_codegen_nvvm_v19/build.rs

@@ -65,12 +65,12 @@ fn target_to_llvm_prebuilt(target: &str) -> String {
 
 fn find_llvm_config(target: &str) -> PathBuf {
     // first, if LLVM_CONFIG is set then see if its llvm version if 7.x, if so, use that.
-    let config_env = tracked_env_var_os("LLVM_CONFIG");
+    let config_env = tracked_env_var_os("LLVM_CONFIG_19");
     // if LLVM_CONFIG is not set, try using llvm-config as a normal app in PATH.
-    let path_to_try = config_env.unwrap_or_else(|| "llvm-config".into());
+    let path_to_try = config_env.unwrap_or_else(|| "llvm-config-19".into());
 
     // if USE_PREBUILT_LLVM is set to 1 then download prebuilt llvm without trying llvm-config
-    if tracked_env_var_os("USE_PREBUILT_LLVM") != Some("1".into()) {
+    if tracked_env_var_os("USE_PREBUILT_LLVM_19") != Some("1".into()) {
         let cmd = Command::new(&path_to_try).arg("--version").output();
 
         if let Ok(out) = cmd {
@@ -125,7 +125,7 @@ fn find_llvm_config(target: &str) -> PathBuf {
 
     out_path
         .join("bin")
-        .join(format!("llvm-config{}", std::env::consts::EXE_SUFFIX))
+        .join(format!("llvm-config-19{}", std::env::consts::EXE_SUFFIX))
 }
 
 fn detect_llvm_link() -> (&'static str, &'static str) {
@@ -152,7 +152,7 @@ fn run_llvm_as() {
 
     println!("cargo:rerun-if-changed=libintrinsics.ll");
 
-    let mut cmd = Command::new("llvm-as");
+    let mut cmd = Command::new("llvm-as-19");
     cmd.arg("libintrinsics.ll");
 
     let output = match cmd.stderr(Stdio::inherit()).output() {

crates/rustc_codegen_nvvm_v19/libintrinsics.bc

@@ -804,7 +804,7 @@ pub(crate) fn build_compile_unit_di_node<'ll, 'tcx>(
 
     debug!("build_compile_unit_di_node: {:?}", name_in_debuginfo);
 
-    let rustc_producer = "rustc_codegen_nvvm".to_string();
+    let rustc_producer = "rustc_codegen_nvvm_v19".to_string();
 
     // leave the clang LLVM in there just in case, although it shouldnt be needed because
     // gpu stuff is different

crates/rustc_codegen_nvvm_v19/src/debug_info/metadata.rs

@@ -4,8 +4,14 @@ version = "0.0.0"
 edition = "2021"
 license = "MIT"
 
+[features]
+default = ["nvvm-v19"]
+nvvm-v7 = ["dep:rustc_codegen_nvvm_v7"]
+nvvm-v19 = ["dep:rustc_codegen_nvvm_v19"]
+
 [dependencies]
 pico-args = "0.4.2"
 rayon = "1.10"
 regex = "1.11.1"
-rustc_codegen_nvvm = { path = "../crates/rustc_codegen_nvvm" }
+rustc_codegen_nvvm_v7 = { path = "../crates/rustc_codegen_nvvm_v7", optional = true }
+rustc_codegen_nvvm_v19 = { path = "../crates/rustc_codegen_nvvm_v19", optional = true }