[DeviceMSAN][NFC] Fix debug message and other misc. changes (#19104)

Author: AllanZyne

libdevice/include/asan_rtl.hpp

@@ -9,8 +9,6 @@
 
 #include "sanitizer_defs.hpp"
 #include "sanitizer_utils.hpp"
-#include "spir_global_var.hpp"
-#include <cstdint>
 
 // Treat this header as system one to workaround frontend's restriction
 #pragma clang system_header

libdevice/include/msan_rtl.hpp

@@ -9,7 +9,6 @@
 
 #include "sanitizer_defs.hpp"
 #include "sanitizer_utils.hpp"
-#include "spir_global_var.hpp"
 
 // Treat this header as system one to workaround frontend's restriction
 #pragma clang system_header

libdevice/include/sanitizer_defs.hpp

@@ -8,7 +8,10 @@
 #pragma once
 
 #include "atomic.hpp"
+#include "device.h"
 #include "spir_global_var.hpp"
+#include "spirv_vars.h"
+
 #include <cstdint>
 
 using uptr = uintptr_t;

libdevice/include/sanitizer_utils.hpp

@@ -1,4 +1,4 @@
-//==------------------ group_utils.hpp - utils for group -------------------==//
+//==------------- sanitizer_utils.hpp - utils for sanitizers ---------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

libdevice/include/tsan_rtl.hpp

@@ -9,7 +9,7 @@
 
 #include "sanitizer_defs.hpp"
 #include "sanitizer_utils.hpp"
-#include "spir_global_var.hpp"
+
 #include "tsan/tsan_libdevice.hpp"
 
 // Treat this header as system one to workaround frontend's restriction

libdevice/sanitizer/asan_rtl.cpp

@@ -8,9 +8,6 @@
 
 #include "include/asan_rtl.hpp"
 #include "asan/asan_libdevice.hpp"
-#include "atomic.hpp"
-#include "device.h"
-#include "spirv_vars.h"
 
 // Save the pointer to LaunchInfo
 __SYCL_GLOBAL__ uptr *__SYCL_LOCAL__ __AsanLaunchInfo;

libdevice/sanitizer/msan_rtl.cpp

@@ -7,12 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "include/msan_rtl.hpp"
-#include "atomic.hpp"
-#include "device.h"
-#include "include/sanitizer_defs.hpp"
-#include "include/sanitizer_utils.hpp"
 #include "msan/msan_libdevice.hpp"
-#include "spirv_vars.h"
 
 DeviceGlobal<void *> __MsanLaunchInfo;
 #define GetMsanLaunchInfo                                                      \
@@ -339,7 +334,7 @@ inline void CopyShadowAndOrigin(uptr dst, uint32_t dst_as, uptr src,
   CopyOrigin(dst, dst_as, src, src_as, size);
 
   MSAN_DEBUG(__spirv_ocl_printf(__msan_print_copy_shadow, dst, dst_as, src,
-                                src_as, shadow_dst, shadow_src));
+                                src_as, shadow_dst, shadow_src, size));
 }
 
 static __SYCL_CONSTANT__ const char __msan_print_move_shadow[] =
@@ -365,7 +360,7 @@ inline void MoveShadowAndOrigin(uptr dst, uint32_t dst_as, uptr src,
   Memmove(shadow_dst, shadow_src, size);
 
   MSAN_DEBUG(__spirv_ocl_printf(__msan_print_move_shadow, dst, dst_as, src,
-                                src_as, shadow_dst, shadow_src));
+                                src_as, shadow_dst, shadow_src, size));
 }
 
 inline void UnpoisonShadow(uptr addr, uint32_t as, size_t size) {

libdevice/sanitizer/tsan_rtl.cpp

@@ -7,9 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "include/tsan_rtl.hpp"
-#include "atomic.hpp"
-#include "device.h"
-#include "spirv_vars.h"
 
 DeviceGlobal<void *> __TsanLaunchInfo;