Merge remote-tracking branch 'intel/sycl' into remapping_virtual_memory_range

Author: dyniols

libdevice/CMakeLists.txt

@@ -8,6 +8,17 @@ set(CMAKE_MODULE_PATH
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
   )
 
+if(EXISTS ${FETCHCONTENT_BASE_DIR}/unified-runtime-src)
+  set(UR_SANITIZER_INCLUDE_DIR
+      ${FETCHCONTENT_BASE_DIR}/unified-runtime-src/source/loader/layers/sanitizer)
+elseif(EXISTS ${SYCL_UR_SOURCE_DIR})
+  set(UR_SANITIZER_INCLUDE_DIR
+      ${SYCL_UR_SOURCE_DIR}/source/loader/layers/sanitizer)
+else()
+  message(WARNING "Unified Runtime source directory is not provided, \
+                   will not build libdevice sanitizer")
+endif()
+
 # Build libdevice for SYCL.
 include(SYCLLibdevice)
 

libdevice/cmake/modules/SYCLLibdevice.cmake

@@ -200,10 +200,10 @@ set(cmath_obj_deps device_math.h device.h sycl-compiler)
 set(imf_obj_deps device_imf.hpp imf_half.hpp imf_bf16.hpp imf_rounding_op.hpp imf_impl_utils.hpp device.h sycl-compiler)
 set(itt_obj_deps device_itt.h spirv_vars.h device.h sycl-compiler)
 set(bfloat16_obj_deps sycl-headers sycl-compiler)
-if (NOT MSVC)
+if (NOT MSVC AND UR_SANITIZER_INCLUDE_DIR)
   set(sanitizer_obj_deps
     device.h atomic.hpp spirv_vars.h
-    include/asan_libdevice.hpp
+    ${UR_SANITIZER_INCLUDE_DIR}/asan_libdevice.hpp
     include/sanitizer_utils.hpp
     include/spir_global_var.hpp
     sycl-compiler)
@@ -268,10 +268,12 @@ if(MSVC)
     SRC msvc_math.cpp
     DEPENDENCIES ${cmath_obj_deps})
 else()
-  add_devicelibs(libsycl-sanitizer
-    SRC sanitizer_utils.cpp
-    DEPENDENCIES ${sanitizer_obj_deps}
-    EXTRA_OPTS -fno-sycl-instrument-device-code)
+  if(UR_SANITIZER_INCLUDE_DIR)
+    add_devicelibs(libsycl-sanitizer
+      SRC sanitizer_utils.cpp
+      DEPENDENCIES ${sanitizer_obj_deps}
+      EXTRA_OPTS -fno-sycl-instrument-device-code -I${UR_SANITIZER_INCLUDE_DIR})
+  endif()
 endif()
 
 add_devicelibs(libsycl-fallback-cassert

libdevice/include/asan_libdevice.hpp

@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "asan_libdevice.hpp"
 #include "atomic.hpp"
 #include "device.h"
 #include "spirv_vars.h"
 
-#include "include/asan_libdevice.hpp"
 #include "include/sanitizer_utils.hpp"
 
 using uptr = uintptr_t;
@@ -381,8 +381,11 @@ void __asan_internal_report_save(DeviceSanitizerErrorType error_type) {
   auto &SanitizerReport = ((__SYCL_GLOBAL__ LaunchInfo *)__AsanLaunchInfo)
                               ->SanitizerReport[WG_LID % ASAN_MAX_NUM_REPORTS];
 
-  if (atomicCompareAndSet(&SanitizerReport.Flag, Desired, Expected) ==
-      Expected) {
+  if (atomicCompareAndSet(
+          &(((__SYCL_GLOBAL__ LaunchInfo *)__AsanLaunchInfo)->ReportFlag), 1,
+          0) == 0 &&
+      atomicCompareAndSet(&SanitizerReport.Flag, Desired, Expected) ==
+          Expected) {
     SanitizerReport.ErrorType = error_type;
     SanitizerReport.IsRecover = false;
 
@@ -415,8 +418,12 @@ void __asan_internal_report_save(
   auto &SanitizerReport = ((__SYCL_GLOBAL__ LaunchInfo *)__AsanLaunchInfo)
                               ->SanitizerReport[WG_LID % ASAN_MAX_NUM_REPORTS];
 
-  if (atomicCompareAndSet(&SanitizerReport.Flag, Desired, Expected) ==
-      Expected) {
+  if ((is_recover ||
+       atomicCompareAndSet(
+           &(((__SYCL_GLOBAL__ LaunchInfo *)__AsanLaunchInfo)->ReportFlag), 1,
+           0) == 0) &&
+      atomicCompareAndSet(&SanitizerReport.Flag, Desired, Expected) ==
+          Expected) {
 
     int FileLength = 0;
     int FuncLength = 0;

libdevice/sanitizer_utils.cpp

@@ -4664,22 +4664,9 @@ bool SPIRVToLLVM::transVectorComputeMetadata(SPIRVFunction *BF) {
                                       std::to_string(Kind));
       F->addParamAttr(ArgNo, Attr);
     }
-    if (BA->hasDecorate(internal::DecorationFuncParamKindINTEL, 0, &Kind)) {
-      Attribute Attr = Attribute::get(*Context, kVCMetadata::VCArgumentKind,
-                                      std::to_string(Kind));
-      F->addParamAttr(ArgNo, Attr);
-    }
     SEVAttr = translateSEVMetadata(BA, F->getContext());
     if (SEVAttr)
       F->addParamAttr(ArgNo, SEVAttr.value());
-    if (BA->hasDecorate(internal::DecorationFuncParamDescINTEL)) {
-      auto Desc =
-          BA->getDecorationStringLiteral(internal::DecorationFuncParamDescINTEL)
-              .front();
-      Attribute Attr =
-          Attribute::get(*Context, kVCMetadata::VCArgumentDesc, Desc);
-      F->addParamAttr(ArgNo, Attr);
-    }
     if (BA->hasDecorate(DecorationMediaBlockIOINTEL)) {
       assert(BA->getType()->isTypeImage() &&
              "MediaBlockIOINTEL decoration is valid only on image parameters");

llvm-spirv/lib/SPIRV/SPIRVReader.cpp

@@ -1070,19 +1070,6 @@ void LLVMToSPIRVBase::transVectorComputeMetadata(Function *F) {
     if (Attrs.hasParamAttr(ArgNo, kVCMetadata::VCSingleElementVector))
       translateSEVDecoration(
           Attrs.getParamAttr(ArgNo, kVCMetadata::VCSingleElementVector), BA);
-    if (Attrs.hasParamAttr(ArgNo, kVCMetadata::VCArgumentKind)) {
-      SPIRVWord Kind;
-      Attrs.getParamAttr(ArgNo, kVCMetadata::VCArgumentKind)
-          .getValueAsString()
-          .getAsInteger(0, Kind);
-      BA->addDecorate(internal::DecorationFuncParamKindINTEL, Kind);
-    }
-    if (Attrs.hasParamAttr(ArgNo, kVCMetadata::VCArgumentDesc)) {
-      StringRef Desc =
-          Attrs.getParamAttr(ArgNo, kVCMetadata::VCArgumentDesc)
-              .getValueAsString();
-      BA->addDecorate(new SPIRVDecorateFuncParamDescAttr(BA, Desc.str()));
-    }
     if (Attrs.hasParamAttr(ArgNo, kVCMetadata::VCMediaBlockIO)) {
       assert(BA->getType()->isTypeImage() &&
              "VCMediaBlockIO attribute valid only on image parameters");

llvm-spirv/lib/SPIRV/SPIRVWriter.cpp

@@ -108,8 +108,6 @@ const static char VCGlobalVariable[] = "VCGlobalVariable";
 const static char VCVolatile[] = "VCVolatile";
 const static char VCByteOffset[] = "VCByteOffset";
 const static char VCSIMTCall[] = "VCSIMTCall";
-const static char VCArgumentKind[] = "VCArgumentKind";
-const static char VCArgumentDesc[] = "VCArgumentDesc";
 const static char VCCallable[] = "VCCallable";
 const static char VCSingleElementVector[] = "VCSingleElementVector";
 const static char VCFCEntry[] = "VCFCEntry";

llvm-spirv/lib/SPIRV/VectorComputeUtil.h

@@ -124,9 +124,6 @@ void SPIRVDecorate::encode(spv_ostream &O) const {
   case DecorationUserSemantic:
     SPIRVDecorateUserSemanticAttr::encodeLiterals(Encoder, Literals);
     break;
-  case internal::DecorationFuncParamDescINTEL:
-    SPIRVDecorateFuncParamDescAttr::encodeLiterals(Encoder, Literals);
-    break;
   case internal::DecorationHostAccessINTEL:
     SPIRVDecorateHostAccessINTELLegacy::encodeLiterals(Encoder, Literals);
     break;
@@ -162,9 +159,6 @@ void SPIRVDecorate::decode(std::istream &I) {
   case DecorationUserSemantic:
     SPIRVDecorateUserSemanticAttr::decodeLiterals(Decoder, Literals);
     break;
-  case internal::DecorationFuncParamDescINTEL:
-    SPIRVDecorateFuncParamDescAttr::decodeLiterals(Decoder, Literals);
-    break;
   case internal::DecorationHostAccessINTEL:
     SPIRVDecorateHostAccessINTELLegacy::decodeLiterals(Decoder, Literals);
     break;
@@ -206,9 +200,6 @@ void SPIRVMemberDecorate::encode(spv_ostream &O) const {
   case DecorationUserSemantic:
     SPIRVDecorateUserSemanticAttr::encodeLiterals(Encoder, Literals);
     break;
-  case internal::DecorationFuncParamDescINTEL:
-    SPIRVDecorateFuncParamDescAttr::encodeLiterals(Encoder, Literals);
-    break;
   default:
     Encoder << Literals;
   }
@@ -232,9 +223,6 @@ void SPIRVMemberDecorate::decode(std::istream &I) {
   case DecorationUserSemantic:
     SPIRVDecorateUserSemanticAttr::decodeLiterals(Decoder, Literals);
     break;
-  case internal::DecorationFuncParamDescINTEL:
-    SPIRVDecorateFuncParamDescAttr::decodeLiterals(Decoder, Literals);
-    break;
   default:
     Decoder >> Literals;
   }

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.cpp

@@ -521,15 +521,6 @@ class SPIRVDecorateUserSemanticAttr
       : SPIRVDecorateStrAttrBase(TheTarget, AnnotateString) {}
 };
 
-class SPIRVDecorateFuncParamDescAttr
-    : public SPIRVDecorateStrAttrBase<internal::DecorationFuncParamDescINTEL> {
-public:
-  //  Complete constructor for UserSemantic decoration
-  SPIRVDecorateFuncParamDescAttr(SPIRVEntry *TheTarget,
-                                 const std::string &AnnotateString)
-      : SPIRVDecorateStrAttrBase(TheTarget, AnnotateString) {}
-};
-
 class SPIRVDecorateMergeINTELAttr : public SPIRVDecorate {
 public:
   // Complete constructor for MergeINTEL decoration

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.h

@@ -448,10 +448,6 @@ template <> inline void SPIRVMap<Decoration, SPIRVCapVec>::init() {
   ADD_VEC_INIT(DecorationFuncParamIOKindINTEL, {CapabilityVectorComputeINTEL});
   ADD_VEC_INIT(DecorationStackCallINTEL, {CapabilityVectorComputeINTEL});
   ADD_VEC_INIT(DecorationSIMTCallINTEL, {CapabilityVectorComputeINTEL});
-  ADD_VEC_INIT(internal::DecorationFuncParamKindINTEL,
-               {CapabilityVectorComputeINTEL});
-  ADD_VEC_INIT(internal::DecorationFuncParamDescINTEL,
-               {CapabilityVectorComputeINTEL});
   ADD_VEC_INIT(DecorationBurstCoalesceINTEL,
                {CapabilityFPGAMemoryAccessesINTEL});
   ADD_VEC_INIT(DecorationCacheSizeINTEL, {CapabilityFPGAMemoryAccessesINTEL});