[SYCL][NFC] Add missing #undef for SPIR-V macros (#5815)

This PR ensures that we don't leak `__SPIRV*` macro definitions from our header files

Author: AlexeySachkov

sycl/include/CL/__spirv/spirv_ops.hpp

@@ -274,6 +274,29 @@ __SPIRV_ATOMICS(__SPIRV_ATOMIC_UNSIGNED, unsigned long long)
 __SPIRV_ATOMICS(__SPIRV_ATOMIC_MINMAX, Min)
 __SPIRV_ATOMICS(__SPIRV_ATOMIC_MINMAX, Max)
 
+#undef __SPIRV_ATOMICS
+#undef __SPIRV_ATOMIC_AND
+#undef __SPIRV_ATOMIC_BASE
+#undef __SPIRV_ATOMIC_CMP_EXCHANGE
+#undef __SPIRV_ATOMIC_EXCHANGE
+#undef __SPIRV_ATOMIC_FADD
+#undef __SPIRV_ATOMIC_FLOAT
+#undef __SPIRV_ATOMIC_FMAX
+#undef __SPIRV_ATOMIC_FMIN
+#undef __SPIRV_ATOMIC_IADD
+#undef __SPIRV_ATOMIC_ISUB
+#undef __SPIRV_ATOMIC_LOAD
+#undef __SPIRV_ATOMIC_MINMAX
+#undef __SPIRV_ATOMIC_OR
+#undef __SPIRV_ATOMIC_SIGNED
+#undef __SPIRV_ATOMIC_SMAX
+#undef __SPIRV_ATOMIC_SMIN
+#undef __SPIRV_ATOMIC_STORE
+#undef __SPIRV_ATOMIC_UMAX
+#undef __SPIRV_ATOMIC_UMIN
+#undef __SPIRV_ATOMIC_UNSIGNED
+#undef __SPIRV_ATOMIC_XOR
+
 extern SYCL_EXTERNAL __attribute__((opencl_global)) void *
 __spirv_GenericCastToPtrExplicit_ToGlobal(const void *Ptr,
                                           __spv::StorageClass::Flag S) noexcept;

sycl/test/basic_tests/macros.cpp

@@ -1,18 +1,17 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-//==------------------- macros.cpp - SYCL buffer basic test ----------------==//
+// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-only -dM -E %s -o %t.device
+// RUN: %clangxx %fsycl-host-only -dM -E %s -o %t.host
 //
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+// FIXME: we should also check that we don't leak __SYCL* and SYCL* macro from
+//        our header files.
+// RUN: FileCheck %s < %t.device --check-prefixes=DEVICE,COMMON \
+// RUN:     --implicit-check-not=__SPIRV
+// RUN: FileCheck %s < %t.host --check-prefixes=COMMON \
+// RUN:      --implicit-check-not=__SPIRV
 //
-//===----------------------------------------------------------------------===//
+// COMMON-DAG: #define SYCL_LANGUAGE_VERSION
+// COMMON-DAG: #define __SYCL_COMPILER_VERSION
+//
+// DEVICE-DAG: #define SYCL_EXTERNAL
+// DEVICE-DAG: #define __SYCL_DEVICE_ONLY__
 
 #include <CL/sycl.hpp>
-#include <iostream>
-
-int main() {
-  std::cout << "SYCL language version: " << SYCL_LANGUAGE_VERSION << std::endl;
-  std::cout << "SYCL compiler version: " << __SYCL_COMPILER_VERSION
-            << std::endl;
-  return 0;
-}