Merge branch 'sycl' into work_group_static

Author: Victor Lomuller

clang/lib/CodeGen/CGVTables.cpp

@@ -803,6 +803,12 @@ void CodeGenVTables::addVTableComponent(ConstantArrayBuilder &builder,
     }
 
     auto getSpecialVirtualFn = [&](StringRef name) -> llvm::Constant * {
+      // There is no guarantee that special function for handling pure virtual
+      // calls will be provided by a SYCL backend compiler and therefore we
+      // simply emit nullptr here.
+      if (CGM.getLangOpts().SYCLIsDevice)
+        return llvm::ConstantPointerNull::get(CGM.GlobalsInt8PtrTy);
+
       // FIXME(PR43094): When merging comdat groups, lld can select a local
       // symbol as the signature symbol even though it cannot be accessed
       // outside that symbol's TU. The relative vtables ABI would make

clang/test/CodeGenSYCL/dont-emit-cxx-pure-virtual.cpp

@@ -0,0 +1,40 @@
+// There is no guarantee that special symbol @__cxa_pure_virtual is supported
+// by SYCL backend compiler, so we need to make sure that we don't emit it
+// during SYCL device compilation.
+//
+// RUN: %clang_cc1 -triple spir64 -fsycl-is-device -emit-llvm %s -o - | FileCheck %s
+//
+// CHECK-NOT: @__cxa_pure_virtual
+
+SYCL_EXTERNAL bool rand();
+
+class Base {
+public:
+  [[__sycl_detail__::add_ir_attributes_function("indirectly-callable", "a")]]
+  virtual void display() {}
+
+  virtual void pure_host() = 0;
+
+  [[__sycl_detail__::add_ir_attributes_function("indirectly-callable", "a")]]
+  virtual void pure_device() = 0;
+};
+
+class Derived1 : public Base {
+public:
+  [[__sycl_detail__::add_ir_attributes_function("indirectly-callable", "a")]]
+  void display() override {}
+
+  void pure_host() override {}
+
+  [[__sycl_detail__::add_ir_attributes_function("indirectly-callable", "a")]]
+  void pure_device() override {}
+};
+
+SYCL_EXTERNAL void test() {
+  Derived1 d1;
+  Base *b = nullptr;
+  if (rand())
+    b = &d1;
+  b->display();
+}
+

devops/cts_exclude_filter_OCL_CPU

@@ -1,4 +0,0 @@
-# https://github.com/intel/llvm/issues/13477
-math_builtin_api
-# https://github.com/intel/llvm/issues/13574
-hierarchical

xpti/include/xpti/xpti_trace_framework.hpp

@@ -55,14 +55,6 @@ typedef void *xpti_plugin_function_t;
 #endif
 #endif
 
-/// Insert something when compiled with msvc
-/// https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros
-#ifdef _MSC_VER
-#define __XPTI_INSERT_IF_MSVC(x) x
-#else
-#define __XPTI_INSERT_IF_MSVC(x)
-#endif
-
 namespace xpti {
 namespace utils {
 /// @class StringHelper
@@ -219,7 +211,9 @@ class PlatformHelper {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
-    __XPTI_INSERT_IF_MSVC(__pragma(warning(suppress : 4996)))
+#ifdef _MSC_VER
+#pragma warning(suppress : 4996)
+#endif
     const char *val = std::getenv(var.c_str());
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic pop