|
3204 | 3204 | 'workernames' : ["as-builder-7"],
|
3205 | 3205 | 'builddir': "flang-runtime-cuda-gcc",
|
3206 | 3206 | 'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
|
3207 |
| - depends_on_projects=["flang"], |
| 3207 | + depends_on_projects=["llvm","clang","mlir","flang","flang-rt"], |
3208 | 3208 | clean=True,
|
3209 | 3209 | checks=[],
|
3210 |
| - src_to_build_dir="flang/runtime", |
3211 |
| - targets=["FortranRuntime"], |
| 3210 | + targets=["flang-rt"], |
3212 | 3211 | extra_configure_args=[
|
3213 | 3212 | "-DCMAKE_BUILD_TYPE=Release",
|
3214 | 3213 | "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
|
3215 | 3214 | "-DLLVM_ENABLE_ASSERTIONS=ON",
|
3216 | 3215 | "-DBUILD_SHARED_LIBS=OFF",
|
3217 |
| - "-DFLANG_EXPERIMENTAL_CUDA_RUNTIME=ON", |
| 3216 | + "-DFLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT=CUDA", |
3218 | 3217 | "-DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc",
|
3219 | 3218 | "-DCMAKE_CXX_COMPILER=/usr/bin/g++",
|
3220 | 3219 | "-DCMAKE_C_COMPILER=/usr/bin/gcc",
|
|
3224 | 3223 | "-DCMAKE_CUDA_COMPILER_LAUNCHER=ccache",
|
3225 | 3224 | "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
|
3226 | 3225 | "-DCMAKE_C_COMPILER_LAUNCHER=ccache",
|
3227 |
| - util.Interpolate("-DFLANG_LIBCUDACXX_PATH=%(prop:nv_cccl_root_path)s/libcudacxx"), |
| 3226 | + util.Interpolate("-DFLANG_RT_LIBCUDACXX_PATH=%(prop:nv_cccl_root_path)s/libcudacxx"), |
3228 | 3227 | ],
|
3229 | 3228 | env={
|
3230 | 3229 | 'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
|
|
3241 | 3240 | clean = True,
|
3242 | 3241 | stages = [
|
3243 | 3242 | dict(
|
3244 |
| - name = "clang", |
3245 |
| - depends_on_projects = ["llvm", "clang", "clang-tools-extra", "lld", "openmp"], |
| 3243 | + name = "flang", |
| 3244 | + depends_on_projects = ["llvm", "clang", "flang", "clang-tools-extra", "lld", "openmp"], |
3246 | 3245 | enable_runtimes = ["compiler-rt"],
|
3247 | 3246 | cmake_definitions = {
|
3248 | 3247 | "LLVM_CCACHE_BUILD" : "ON",
|
|
3251 | 3250 | "LLVM_TARGETS_TO_BUILD" : "Native",
|
3252 | 3251 | "CLANG_DEFAULT_LINKER" : "lld",
|
3253 | 3252 | },
|
3254 |
| - install_dir = "install-clang", |
| 3253 | + install_dir = "install-flang", |
3255 | 3254 | env = {
|
3256 | 3255 | 'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
|
3257 | 3256 | },
|
3258 | 3257 | ),
|
3259 | 3258 | dict(
|
3260 |
| - name = "flang-runtime", |
3261 |
| - depends_on_projects = ["flang"], |
| 3259 | + name = "flang-rt", |
| 3260 | + depends_on_projects = ["flang-rt"], |
3262 | 3261 | cmake_definitions = {
|
3263 | 3262 | "CMAKE_BUILD_TYPE" : "Release",
|
3264 |
| - "CMAKE_C_COMPILER" : util.Interpolate("%(prop:builddir)s/install-clang/bin/clang"), |
3265 |
| - "CMAKE_CXX_COMPILER" : util.Interpolate("%(prop:builddir)s/install-clang/bin/clang++"), |
3266 |
| - "FLANG_EXPERIMENTAL_OMP_OFFLOAD_BUILD" : "host_device", |
3267 |
| - "FLANG_OMP_DEVICE_ARCHITECTURES" : "sm_50;sm_60;sm_70;sm_80", |
| 3263 | + "CMAKE_C_COMPILER" : util.Interpolate("%(prop:builddir)s/install-flang/bin/clang"), |
| 3264 | + "CMAKE_CXX_COMPILER" : util.Interpolate("%(prop:builddir)s/install-flang/bin/clang++"), |
| 3265 | + "CMAKE_Fortran_COMPILER" : util.Interpolate("%(prop:builddir)s/install-flang/bin/flang"), |
| 3266 | + "CMAKE_Fortran_COMPILER_WORKS" : "ON", |
| 3267 | + "FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT" : "OpenMP", |
| 3268 | + "FLANG_RT_OMP_DEVICE_ARCHITECTURES" : "sm_50;sm_60;sm_70;sm_80", |
3268 | 3269 | },
|
3269 |
| - targets = ["FortranRuntime"], |
3270 |
| - src_to_build_dir = "flang/runtime", |
| 3270 | + src_to_build_dir = "runtimes", |
3271 | 3271 | ),
|
3272 | 3272 | ],
|
3273 | 3273 | env = {
|
|
0 commit comments