[NFC] Move macro initialization to device FE

Signed-off-by: Artem Gindinson <[email protected]>

Author: Artem Gindinson

clang/lib/Driver/ToolChains/Clang.cpp

@@ -4676,21 +4676,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     if (HasFPGA)
       CmdArgs.push_back("-fsycl-disable-range-rounding");
 
-    const auto &DeviceTriple = getToolChain().getTriple();
-    const auto &DeviceSubArch = DeviceTriple.getSubArch();
     // Enable generation of USM address spaces for FPGA.
     // __ENABLE_USM_ADDR_SPACE__ will be used during compilation of SYCL headers
-    if (DeviceSubArch == llvm::Triple::SPIRSubArch_fpga)
+    if (getToolChain().getTriple().getSubArch() ==
+        llvm::Triple::SPIRSubArch_fpga)
       CmdArgs.push_back("-D__ENABLE_USM_ADDR_SPACE__");
 
-    // Use native FP atomics on supported targets by default.
-    // TODO: Currently, only OpenCL CPU and Intel GPU support the functions.
-    // Allow other targets through check once/if support for
-    // SPV_EXT_shader_atomic_float* extensions lands there.
-    if (DeviceTriple.isSPIR() &&
-        DeviceSubArch != llvm::Triple::SPIRSubArch_fpga)
-      CmdArgs.push_back("-DSYCL_USE_NATIVE_FP_ATOMICS");
-
     // Add any options that are needed specific to SYCL offload while
     // performing the host side compilation.
     if (!IsSYCLOffloadDevice) {

clang/lib/Frontend/InitPreprocessor.cpp

@@ -1179,8 +1179,14 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
     Builder.defineMacro("__SYCL_DEVICE_ONLY__", "1");
     Builder.defineMacro("SYCL_EXTERNAL", "__attribute__((sycl_device))");
 
-    if (TI.getTriple().isNVPTX()) {
-        Builder.defineMacro("__SYCL_NVPTX__", "1");
+    const llvm::Triple &DeviceTriple = TI.getTriple();
+    if (DeviceTriple.isNVPTX()) {
+      Builder.defineMacro("__SYCL_NVPTX__", "1");
+    }
+    const llvm::Triple::SubArchType DeviceSubArch = DeviceTriple.getSubArch();
+    if (DeviceTriple.isSPIR() &&
+        DeviceSubArch != llvm::Triple::SPIRSubArch_fpga) {
+      Builder.defineMacro("SYCL_USE_NATIVE_FP_ATOMICS");
     }
   }
   if (LangOpts.SYCLUnnamedLambda)

clang/test/Driver/sycl-offload-fp-atomics.cpp

@@ -0,0 +1,13 @@
+// RUN: %clang_cc1 %s -fsycl-is-device -triple spir64-unknown-unknown-sycldevice -E -dM \
+// RUN: | FileCheck --check-prefix=CHECK-SYCL-FP-ATOMICS %s
+// RUN: %clang_cc1 %s -fsycl-is-device -triple spir64_gen-unknown-unknown-sycldevice -E -dM \
+// RUN: | FileCheck --check-prefix=CHECK-SYCL-FP-ATOMICS %s
+// RUN: %clang_cc1 %s -fsycl-is-device -triple spir64_x86_64-unknown-unknown-sycldevice -E -dM \
+// RUN: | FileCheck --check-prefix=CHECK-SYCL-FP-ATOMICS %s
+// RUN: %clang_cc1 %s -fsycl-is-device -triple spir64_fpga-unknown-unknown-sycldevice -E -dM \
+// RUN: | FileCheck --check-prefix=CHECK-SYCL-FP-ATOMICS-NEG %s
+// RUN: %clang_cc1 %s -fsycl-is-device -triple nvptx64-nvidia-nvcl-sycldevice -E -dM \
+// RUN: | FileCheck --check-prefix=CHECK-SYCL-FP-ATOMICS-NEG %s
+
+// CHECK-SYCL-FP-ATOMICS: #define SYCL_USE_NATIVE_FP_ATOMICS
+// CHECK-SYCL-FP-ATOMICS-NEG-NOT: #define SYCL_USE_NATIVE_FP_ATOMICS