unify both ol and omp runtime builds into one step

Author: ZuseZ4

src/bootstrap/src/core/build_steps/compile.rs

@@ -1442,8 +1442,7 @@ fn rustc_llvm_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetSelect
     }
     let llvm::LlvmResult { host_llvm_config, .. } = builder.ensure(llvm::Llvm { target });
     if builder.config.llvm_offload {
-        builder.ensure(llvm::Openmp { target });
-        builder.ensure(llvm::Offload { target });
+        builder.ensure(llvm::OmpOffload { target });
         cargo.env("LLVM_OFFLOAD", "1");
     }
 

src/bootstrap/src/core/build_steps/llvm.rs

@@ -911,23 +911,24 @@ fn get_var(var_base: &str, host: &str, target: &str) -> Option<OsString> {
 }
 
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
-pub struct Openmp {
+pub struct OmpOffload {
     pub target: TargetSelection,
 }
 
-impl Step for Openmp {
+impl Step for OmpOffload {
     type Output = PathBuf;
     const IS_HOST: bool = true;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.path("src/llvm-project/openmp")
+        run.path("src/llvm-project/offload")
     }
 
     fn make_run(run: RunConfig<'_>) {
-        run.builder.ensure(Openmp { target: run.target });
+        run.builder.ensure(OmpOffload { target: run.target });
     }
 
     /// Compile OpenMP offload runtimes for `target`.
+    #[allow(unused)]
     fn run(self, builder: &Builder<'_>) -> PathBuf {
         if builder.config.dry_run() {
             return PathBuf::from("/");
@@ -941,7 +942,7 @@ impl Step for Openmp {
         //let smart_stamp_hash = STAMP_HASH_MEMO.get_or_init(|| {
         //    generate_smart_stamp_hash(
         //        builder,
-        //        &builder.config.src.join("src/llvm-project/openmp"),
+        //        &builder.config.src.join("src/llvm-project/offload"),
         //        builder.offload_info.sha().unwrap_or_default(),
         //    )
         //});
@@ -963,8 +964,8 @@ impl Step for Openmp {
         //    return out_dir;
         //}
 
-        trace!(?target, "(re)building openmp artifacts");
-        builder.info(&format!("Building OpenMP for {target}"));
+        trace!(?target, "(re)building offload artifacts");
+        builder.info(&format!("Building Omp/Offload for {target}"));
         //t!(stamp.remove());
         let _time = helpers::timeit(builder);
         t!(fs::create_dir_all(&out_dir));
@@ -987,10 +988,7 @@ impl Step for Openmp {
             .profile(profile)
             .env("LLVM_CONFIG_REAL", &host_llvm_config)
             .define("LLVM_ENABLE_ASSERTIONS", "ON")
-            .define("TARGET_TRIPLE", &target.triple)
-            .define("LLVM_ENABLE_RUNTIMES", "offload")
-            //.define("CMAKE_C_COMPILER", builder.cc(target))
-            //.define("CMAKE_CXX_COMPILER", builder.cxx(target).unwrap())
+            .define("LLVM_ENABLE_RUNTIMES", "openmp;offload")
             //.define(
             //    "CMAKE_C_COMPILER",
             //    "/tmp/drehwald1/prog/rust/build/x86_64-unknown-linux-gnu/llvm/bin/clang",
@@ -999,197 +997,20 @@ impl Step for Openmp {
             //    "CMAKE_CXX_COMPILER",
             //    "/tmp/drehwald1/prog/rust/build/x86_64-unknown-linux-gnu/llvm/bin/clang++",
             //)
+            .define("CMAKE_C_COMPILER", builder.cc(target))
+            .define("CMAKE_CXX_COMPILER", builder.cxx(target).unwrap())
             .define("LLVM_DEFAULT_TARGET_TRIPLE", &target.triple)
-            .define("OFFLOAD_STANDALONE_BUILD", "ON")
-            .define("LLVM_ROOT", builder.llvm_out(target))
+            .define("OPENMP_STANDALONE_BUILD", "ON")
+            .define("LLVM_ROOT", builder.llvm_out(target).join("build"))
             //.define(
             //    "LLVM_ROOT",
             //    "/tmp/drehwald1/prog/rust/build/x86_64-unknown-linux-gnu/llvm/build/",
             //)
             .define("LLVM_DIR", builder.llvm_out(target).join("lib").join("cmake").join("llvm"));
-
-        if builder.config.llvm_clang {
-            // This is likely the case locally. If we just build clang in the previous step, we
-            // should use it. We wouldn't even need a standalone build here, but it's easier to
-            // unify this with the case below, which needs standalone builds.
-            // We likely wouldn't need to specify these here, they should be found by default.
-            cfg.define("CMAKE_C_COMPILER", builder.cc(target))
-                .define("CMAKE_CXX_COMPILER", builder.cxx(target).unwrap());
-        } else {
-            // This is the (more complicated) case which we have e.g. in CI. We first build a
-            // standalone llvm/llvm-project including clang. Then we use this clang to build the
-            // llvm submodule of rustc in src/llvm-project. In this case we do *NOT* build clang
-            // again in the llvm submodule to save compile times, this is a hard requirement.
-            // If we build the offload and openmp runtimes in-tree, they assume that clang was
-            // already build in-tree, which is not the case here. We therefore must use standalone
-            // builds of these two runtimes. We now have to specify clang(++) manually to match the
-            // one we build in llvm/llvm-project
-            cfg.define("CMAKE_C_COMPILER", builder.cc(target))
-                .define("CMAKE_CXX_COMPILER", builder.cxx(target).unwrap());
-        }
-        // /tmp/drehwald1/prog/rust/build/x86_64-unknown-linux-gnu/llvm/lib/cmake/llvm
-        //$> cmake ../runtimes \ # Point to the runtimes build
-        //   -G Ninja                                  \
-        //   -DLLVM_ENABLE_RUNTIMES=openmp               \
-        //   -DCMAKE_C_COMPILER=$TARGET_C_COMPILER     \
-        //   -DCMAKE_CXX_COMPILER=$TARGET_CXX_COMPILER \
-        //   -DLLVM_DEFAULT_TARGET_TRIPLE=$TARGET_TRIPLE     \
-        //   -DCMAKE_BUILD_TYPE=Release
         cfg.build();
 
         //t!(stamp.write());
         out_dir
-
-        //$> cd llvm-project  # The llvm-project checkout
-        //$> mkdir build # A different build directory for the build tools
-        //$> cd build
-        //$> TARGET_TRIPLE=<amdgcn-amd-amdhsa or nvptx64-nvidia-cuda>
-        //$> TARGET_C_COMPILER=</path/to/clang>
-        //$> TARGET_CXX_COMPILER=</path/to/clang++>
-        //$> ninja install
-        //
-        //You can do the same thing for the offload project.
-        //
-        //$> TARGET_C_COMPILER=</path/to/clang>
-        //$> TARGET_CXX_COMPILER=</path/to/clang++>
-        //$> cmake ../runtimes \ # Point to the runtimes build
-        //   -G Ninja                                  \
-        //   -DLLVM_ENABLE_RUNTIMES=openmp               \
-        //   -DCMAKE_C_COMPILER=$TARGET_C_COMPILER     \
-        //   -DCMAKE_CXX_COMPILER=$TARGET_CXX_COMPILER \
-        //   -DCMAKE_BUILD_TYPE=Release
-        //$> ninja install
-    }
-}
-
-#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
-pub struct Offload {
-    pub target: TargetSelection,
-}
-
-impl Step for Offload {
-    type Output = PathBuf;
-    const IS_HOST: bool = true;
-
-    fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.path("src/llvm-project/offload")
-    }
-
-    fn make_run(run: RunConfig<'_>) {
-        run.builder.ensure(Offload { target: run.target });
-    }
-
-    /// Compile OpenMP offload runtimes for `target`.
-    fn run(self, builder: &Builder<'_>) -> PathBuf {
-        if builder.config.dry_run() {
-            return PathBuf::from("/");
-        }
-        let target = self.target;
-
-        let LlvmResult { host_llvm_config, .. } = builder.ensure(Llvm { target: self.target });
-
-        let out_dir = builder.llvm_out(target);
-        static STAMP_HASH_MEMO: OnceLock<String> = OnceLock::new();
-        //let smart_stamp_hash = STAMP_HASH_MEMO.get_or_init(|| {
-        //    generate_smart_stamp_hash(
-        //        builder,
-        //        &builder.config.src.join("src/llvm-project/offload"),
-        //        builder.offload_info.sha().unwrap_or_default(),
-        //    )
-        //});
-        //let stamp = BuildStamp::new(&out_dir).with_prefix("enzyme").add_stamp(smart_stamp_hash);
-
-        trace!("checking build stamp to see if we need to rebuild offload/openmp artifacts");
-        //if stamp.is_up_to_date() {
-        //    trace!(?out_dir, "offload/openmp build artifacts are up to date");
-        //    if stamp.stamp().is_empty() {
-        //        builder.info(
-        //            "Could not determine the Offload submodule commit hash. \
-        //             Assuming that an Offload rebuild is not necessary.",
-        //        );
-        //        builder.info(&format!(
-        //            "To force Offload to rebuild, remove the file `{}`",
-        //            stamp.path().display()
-        //        ));
-        //    }
-        //    return out_dir;
-        //}
-
-        trace!(?target, "(re)building offload artifacts");
-        builder.info(&format!("Building Offload for {target}"));
-        //t!(stamp.remove());
-        let _time = helpers::timeit(builder);
-        t!(fs::create_dir_all(&out_dir));
-
-        builder.config.update_submodule(Path::new("src").join("llvm-project").to_str().unwrap());
-        let mut cfg = cmake::Config::new(builder.src.join("src/llvm-project/runtimes/"));
-        configure_cmake(builder, target, &mut cfg, true, LdFlags::default(), &[]);
-
-        // Re-use the same flags as llvm to control the level of debug information
-        // generated by Enzyme.
-        // FIXME(ZuseZ4): Find a nicer way to use Enzyme Debug builds.
-        let profile = match (builder.config.llvm_optimize, builder.config.llvm_release_debuginfo) {
-            (false, _) => "Debug",
-            (true, false) => "Release",
-            (true, true) => "RelWithDebInfo",
-        };
-        trace!(?profile);
-
-        cfg.out_dir(&out_dir)
-            .profile(profile)
-            .env("LLVM_CONFIG_REAL", &host_llvm_config)
-            .define("LLVM_ENABLE_ASSERTIONS", "ON")
-            .define("TARGET_TRIPLE", &target.triple)
-            .define("LLVM_ENABLE_RUNTIMES", "openmp")
-            .define(
-                "CMAKE_C_COMPILER",
-                "/tmp/drehwald1/prog/rust/build/x86_64-unknown-linux-gnu/llvm/bin/clang",
-            )
-            .define(
-                "CMAKE_CXX_COMPILER",
-                "/tmp/drehwald1/prog/rust/build/x86_64-unknown-linux-gnu/llvm/bin/clang++",
-            )
-            //.define("CMAKE_C_COMPILER", builder.cc(target))
-            //.define("CMAKE_CXX_COMPILER", builder.cxx(target).unwrap())
-            .define("LLVM_DEFAULT_TARGET_TRIPLE", &target.triple)
-            .define("OPENMP_STANDALONE_BUILD", "ON")
-            .define(
-                "LLVM_ROOT",
-                "/tmp/drehwald1/prog/rust/build/x86_64-unknown-linux-gnu/llvm/build/",
-            )
-            .define("LLVM_DIR", builder.llvm_out(target).join("lib").join("cmake").join("llvm"));
-        ///tmp/drehwald1/prog/rust/build/x86_64-unknown-linux-gnu/llvm/lib/cmake/llvm
-        //$> cmake ../runtimes \ # Point to the runtimes build
-        //   -G Ninja                                  \
-        //   -DLLVM_ENABLE_RUNTIMES=openmp               \
-        //   -DCMAKE_C_COMPILER=$TARGET_C_COMPILER     \
-        //   -DCMAKE_CXX_COMPILER=$TARGET_CXX_COMPILER \
-        //   -DLLVM_DEFAULT_TARGET_TRIPLE=$TARGET_TRIPLE     \
-        //   -DCMAKE_BUILD_TYPE=Release
-        cfg.build();
-
-        //t!(stamp.write());
-        out_dir
-
-        //$> cd llvm-project  # The llvm-project checkout
-        //$> mkdir build # A different build directory for the build tools
-        //$> cd build
-        //$> TARGET_TRIPLE=<amdgcn-amd-amdhsa or nvptx64-nvidia-cuda>
-        //$> TARGET_C_COMPILER=</path/to/clang>
-        //$> TARGET_CXX_COMPILER=</path/to/clang++>
-        //$> ninja install
-        //
-        //You can do the same thing for the offload project.
-        //
-        //$> TARGET_C_COMPILER=</path/to/clang>
-        //$> TARGET_CXX_COMPILER=</path/to/clang++>
-        //$> cmake ../runtimes \ # Point to the runtimes build
-        //   -G Ninja                                  \
-        //   -DLLVM_ENABLE_RUNTIMES=openmp               \
-        //   -DCMAKE_C_COMPILER=$TARGET_C_COMPILER     \
-        //   -DCMAKE_CXX_COMPILER=$TARGET_CXX_COMPILER \
-        //   -DCMAKE_BUILD_TYPE=Release
-        //$> ninja install
     }
 }