Enable CMake options for building for AMD

ndgrigorian · ndgrigorian · commit 8bb213679af6 · 2024-11-20T18:51:14.000-08:00
Add DPCTL_TARGET_AMD cmake variable which is a string referring to the architecture to build for
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,25 +29,66 @@ option(DPCTL_TARGET_CUDA
     "Build DPCTL to target CUDA devices"
     OFF
 )
+set(DPCTL_TARGET_AMD
+    ""
+    CACHE STRING 
+    "Build DPCTL to target an AMD device architecture"
+)
 option(DPCTL_WITH_REDIST "Build DPCTL assuming DPC++ redistributable is installed into Python prefix" OFF)
 
 find_package(IntelSYCL REQUIRED PATHS ${CMAKE_SOURCE_DIR}/cmake NO_DEFAULT_PATH)
 
+set(_dpctl_sycl_target_compile_options)
+set(_dpctl_sycl_target_link_options)
+
 set(_dpctl_sycl_targets)
+set(_dpctl_amd_targets)
 if ("x${DPCTL_SYCL_TARGETS}" STREQUAL "x")
-   if(DPCTL_TARGET_CUDA)
+   if (DPCTL_TARGET_CUDA)
       set(_dpctl_sycl_targets "nvptx64-nvidia-cuda,spir64-unknown-unknown")
    else()
-      if(DEFINED ENV{DPCTL_TARGET_CUDA})
+      if (DEFINED ENV{DPCTL_TARGET_CUDA})
           set(_dpctl_sycl_targets "nvptx64-nvidia-cuda,spir64-unknown-unknown")
       endif()
    endif()
+   if (NOT "x${DPCTL_TARGET_AMD}" STREQUAL "x")
+      if(_dpctl_sycl_targets)
+         set(_dpctl_sycl_targets "amdgcn-amd-amdhsa,spir64-unknown-unknown")
+         set(_dpctl_amd_targets ${DPCTL_TARGET_AMD})
+      else()
+         set(_dpctl_sycl_targets "amdgcn-amd-amdhsa,${_dpctl_sycl_targets}")
+         set(_dpctl_amd_targets ${DPCTL_TARGET_AMD})
+      endif()
+   else()
+      if (DEFINED ENV{DPCTL_TARGET_AMD})
+         if(_dpctl_sycl_targets)
+            set(_dpctl_sycl_targets "amdgcn-amd-amdhsa,spir64-unknown-unknown")
+            set(_dpctl_amd_targets $ENV{DPCTL_TARGET_AMD})
+         else()
+            set(_dpctl_sycl_targets "amdgcn-amd-amdhsa,${_dpctl_sycl_targets}")
+            set(_dpctl_amd_targets $ENV{DPCTL_TARGET_AMD})
+         endif()
+      endif()
+   endif()
 else()
    set(_dpctl_sycl_targets ${DPCTL_SYCL_TARGETS})
+   if (NOT "x${DPCTL_TARGET_AMD}" STREQUAL "x")
+      set(_dpctl_amd_targets ${DPCTL_TARGET_AMD})
+   else()
+      if (DEFINED ENV{DPCTL_TARGET_AMD})
+         set(_dpctl_amd_targets $ENV{DPCTL_TARGET_AMD})
+      endif()
+   endif()
 endif()
 
-if(_dpctl_sycl_targets)
+if (_dpctl_sycl_targets)
    message(STATUS "Compiling for -fsycl-targets=${_dpctl_sycl_targets}")
+   list(APPEND _dpctl_sycl_target_compile_options -fsycl-targets=${_dpctl_sycl_targets})
+   list(APPEND _dpctl_sycl_target_link_options -fsycl-targets=${_dpctl_sycl_targets})
+   if(_dpctl_amd_targets)
+      list(APPEND _dpctl_sycl_target_compile_options -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=${_dpctl_amd_targets})
+      list(APPEND _dpctl_sycl_target_link_options -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=${_dpctl_amd_targets})
+   endif()
 endif()
 
 add_subdirectory(libsyclinterface)
diff --git a/dpctl/CMakeLists.txt b/dpctl/CMakeLists.txt
@@ -116,12 +116,12 @@ function(build_dpctl_ext _trgt _src _dest)
             target_compile_options(
                 ${_trgt}
                 PRIVATE
-                -fsycl-targets=${_dpctl_sycl_targets}
+                ${_dpctl_sycl_target_compile_options}
             )
             target_link_options(
                 ${_trgt}
                 PRIVATE
-                -fsycl-targets=${_dpctl_sycl_targets}
+                ${_dpctl_sycl_target_link_options}
             )
         endif()
     endif()
diff --git a/dpctl/tensor/CMakeLists.txt b/dpctl/tensor/CMakeLists.txt
@@ -300,12 +300,12 @@ foreach(python_module_name ${_py_trgts})
         target_compile_options(
             ${python_module_name}
             PRIVATE
-            -fsycl-targets=${_dpctl_sycl_targets}
+            ${_dpctl_sycl_target_compile_options}
         )
         target_link_options(
             ${python_module_name}
             PRIVATE
-            -fsycl-targets=${_dpctl_sycl_targets}
+            ${_dpctl_sycl_target_link_options}
         )
     endif()
     # TODO: update source so they refernece individual libraries instead of
diff --git a/dpctl/utils/CMakeLists.txt b/dpctl/utils/CMakeLists.txt
@@ -50,12 +50,12 @@ foreach(python_module_name ${_pybind11_targets})
         target_compile_options(
             ${python_module_name}
             PRIVATE
-            -fsycl-targets=${_dpctl_sycl_targets}
+            ${_dpctl_sycl_target_compile_options}
         )
         target_link_options(
             ${python_module_name}
             PRIVATE
-            -fsycl-targets=${_dpctl_sycl_targets}
+            ${_dpctl_sycl_target_link_options}
         )
     endif()
     # TODO: update source so they refernece individual libraries instead of
diff --git a/libsyclinterface/CMakeLists.txt b/libsyclinterface/CMakeLists.txt
@@ -244,13 +244,13 @@ if(_dpctl_sycl_targets)
     target_compile_options(
         DPCTLSyclInterface
         PRIVATE
-        -fsycl-targets=${_dpctl_sycl_targets}
+        ${_dpctl_sycl_target_compile_options}
     )
     target_link_options(
         DPCTLSyclInterface
         PRIVATE
-        -fsycl-targets=${_dpctl_sycl_targets}
-   )
+        ${_dpctl_sycl_target_link_options}
+    )
 endif()
 
 if(DPCTL_GENERATE_COVERAGE)
diff --git a/libsyclinterface/tests/CMakeLists.txt b/libsyclinterface/tests/CMakeLists.txt
@@ -55,16 +55,15 @@ add_sycl_to_target(
 )
 
 if(_dpctl_sycl_targets)
-    # make fat binary
     target_compile_options(
         dpctl_c_api_tests
         PRIVATE
-        -fsycl-targets=${_dpctl_sycl_targets}
+        ${_dpctl_sycl_target_compile_options}
     )
     target_link_options(
         dpctl_c_api_tests
         PRIVATE
-        -fsycl-targets=${_dpctl_sycl_targets}
+        ${_dpctl_sycl_target_link_options}
     )
 endif()
 
@@ -85,16 +84,15 @@ target_include_directories(dpctl_c_api_tests
 )
 
 if(_dpctl_sycl_targets)
-    # make fat binary
     target_compile_options(
         dpctl_c_api_tests
         PRIVATE
-        -fsycl-targets=${_dpctl_sycl_targets}
+        ${_dpctl_sycl_target_compile_options}
     )
     target_link_options(
         dpctl_c_api_tests
         PRIVATE
-        -fsycl-targets=${_dpctl_sycl_targets}
+        ${_dpctl_sycl_target_link_options}
     )
 endif()
 

Original file line number	Diff line number	Diff line change
`@@ -55,16 +55,15 @@ add_sycl_to_target(`
`55`	`55`	`)`
`56`	`56`
`57`	`57`	`if(_dpctl_sycl_targets)`
`58`		`- # make fat binary`
`59`	`58`	`target_compile_options(`
`60`	`59`	`dpctl_c_api_tests`
`61`	`60`	`PRIVATE`
`62`		`- -fsycl-targets=${_dpctl_sycl_targets}`
	`61`	`+ ${_dpctl_sycl_target_compile_options}`
`63`	`62`	`)`
`64`	`63`	`target_link_options(`
`65`	`64`	`dpctl_c_api_tests`
`66`	`65`	`PRIVATE`
`67`		`- -fsycl-targets=${_dpctl_sycl_targets}`
	`66`	`+ ${_dpctl_sycl_target_link_options}`
`68`	`67`	`)`
`69`	`68`	`endif()`
`70`	`69`
`@@ -85,16 +84,15 @@ target_include_directories(dpctl_c_api_tests`
`85`	`84`	`)`
`86`	`85`
`87`	`86`	`if(_dpctl_sycl_targets)`
`88`		`- # make fat binary`
`89`	`87`	`target_compile_options(`
`90`	`88`	`dpctl_c_api_tests`
`91`	`89`	`PRIVATE`
`92`		`- -fsycl-targets=${_dpctl_sycl_targets}`
	`90`	`+ ${_dpctl_sycl_target_compile_options}`
`93`	`91`	`)`
`94`	`92`	`target_link_options(`
`95`	`93`	`dpctl_c_api_tests`
`96`	`94`	`PRIVATE`
`97`		`- -fsycl-targets=${_dpctl_sycl_targets}`
	`95`	`+ ${_dpctl_sycl_target_link_options}`
`98`	`96`	`)`
`99`	`97`	`endif()`
`100`	`98`