Treat all variants of -fsanitize=address as unsupported.

Signed-off-by: Julian Oppermann <[email protected]>

Author: jopperm

sycl-jit/jit-compiler/lib/rtc/DeviceCompilation.cpp

@@ -235,8 +235,6 @@ getDeviceLibraries(const ArgList &Args, DiagnosticsEngine &Diags) {
       {"libsycl-itt-user-wrappers", "internal"},
       {"libsycl-itt-compiler-wrappers", "internal"},
       {"libsycl-itt-stubs", "internal"}};
-  const SYCLDeviceLibsList SYCLDeviceSanitizerLibs = {
-      {"libsycl-sanitizer", "internal"}};
 
   SmallVector<std::string, 8> LibraryList;
   StringRef LibSuffix = ".bc";
@@ -258,44 +256,6 @@ getDeviceLibraries(const ArgList &Args, DiagnosticsEngine &Diags) {
     AddLibraries(SYCLDeviceAnnotationLibs);
   }
 
-  if (Arg *A = Args.getLastArg(OPT_fsanitize_EQ, OPT_fno_sanitize_EQ)) {
-    if (A->getOption().matches(OPT_fsanitize_EQ) &&
-        A->getValues().size() == 1) {
-      std::string SanitizeVal = A->getValue();
-      if (SanitizeVal == "address") {
-        AddLibraries(SYCLDeviceSanitizerLibs);
-      }
-    }
-  } else {
-    // User can pass -fsanitize=address to device compiler via
-    // -Xsycl-target-frontend, sanitize device library must be
-    // linked with user's device image if so.
-    bool IsDeviceAsanEnabled = false;
-    auto SyclFEArg = Args.getAllArgValues(OPT_Xsycl_frontend);
-    IsDeviceAsanEnabled = (std::count(SyclFEArg.begin(), SyclFEArg.end(),
-                                      "-fsanitize=address") > 0);
-    if (!IsDeviceAsanEnabled) {
-      auto SyclFEArgEq = Args.getAllArgValues(OPT_Xsycl_frontend_EQ);
-      IsDeviceAsanEnabled = (std::count(SyclFEArgEq.begin(), SyclFEArgEq.end(),
-                                        "-fsanitize=address") > 0);
-    }
-
-    // User can also enable asan for SYCL device via -Xarch_device option.
-    if (!IsDeviceAsanEnabled) {
-      auto DeviceArchVals = Args.getAllArgValues(OPT_Xarch_device);
-      for (auto DArchVal : DeviceArchVals) {
-        if (DArchVal.find("-fsanitize=address") != std::string::npos) {
-          IsDeviceAsanEnabled = true;
-          break;
-        }
-      }
-    }
-
-    if (IsDeviceAsanEnabled) {
-      AddLibraries(SYCLDeviceSanitizerLibs);
-    }
-  }
-
   return LibraryList;
 }
 
@@ -357,5 +317,48 @@ jit_compiler::parseUserArgs(View<const char *> UserArgs) {
         "User option '%s' at index %d is missing an argument",
         UserArgsRef[MissingArgIndex], MissingArgIndex);
   }
+
+  // Check for unsupported options.
+  // TODO: There are probably more, e.g. requesting non-SPIR-V targets.
+  {
+    // -fsanitize=address
+    bool IsDeviceAsanEnabled = false;
+    if (Arg *A = AL.getLastArg(OPT_fsanitize_EQ, OPT_fno_sanitize_EQ)) {
+      if (A->getOption().matches(OPT_fsanitize_EQ) &&
+          A->getValues().size() == 1) {
+        std::string SanitizeVal = A->getValue();
+        IsDeviceAsanEnabled = SanitizeVal == "address";
+      }
+    } else {
+      // User can pass -fsanitize=address to device compiler via
+      // -Xsycl-target-frontend.
+      auto SyclFEArg = AL.getAllArgValues(OPT_Xsycl_frontend);
+      IsDeviceAsanEnabled = (std::count(SyclFEArg.begin(), SyclFEArg.end(),
+                                        "-fsanitize=address") > 0);
+      if (!IsDeviceAsanEnabled) {
+        auto SyclFEArgEq = AL.getAllArgValues(OPT_Xsycl_frontend_EQ);
+        IsDeviceAsanEnabled =
+            (std::count(SyclFEArgEq.begin(), SyclFEArgEq.end(),
+                        "-fsanitize=address") > 0);
+      }
+
+      // User can also enable asan for SYCL device via -Xarch_device option.
+      if (!IsDeviceAsanEnabled) {
+        auto DeviceArchVals = AL.getAllArgValues(OPT_Xarch_device);
+        for (auto DArchVal : DeviceArchVals) {
+          if (DArchVal.find("-fsanitize=address") != std::string::npos) {
+            IsDeviceAsanEnabled = true;
+            break;
+          }
+        }
+      }
+    }
+
+    if (IsDeviceAsanEnabled) {
+      return createStringError(
+          "Device ASAN is not supported for runtime compilation");
+    }
+  }
+
   return Expected<InputArgList>{std::move(AL)};
 }

sycl/test-e2e/KernelCompiler/kernel_compiler_sycl_jit.cpp

@@ -119,10 +119,40 @@ void test_build_and_run() {
   test_1(q, k, 37 + 5); // ff_cp seeds 37. AddEm will add 5 more.
 }
 
+void test_unsupported_options() {
+  namespace syclex = sycl::ext::oneapi::experimental;
+  using source_kb = sycl::kernel_bundle<sycl::bundle_state::ext_oneapi_source>;
+
+  sycl::queue q;
+  sycl::context ctx = q.get_context();
+
+  source_kb kbSrc = syclex::create_kernel_bundle_from_source(
+      ctx, syclex::source_language::sycl_jit, "");
+  std::vector<sycl::device> devs = kbSrc.get_devices();
+
+  auto CheckUnsupported = [&](const std::vector<std::string> &flags) {
+    try {
+      syclex::build(kbSrc, devs,
+                    syclex::properties{syclex::build_options{flags}});
+      assert(false && "Unsupported option not detected");
+    } catch (sycl::exception &e) {
+      assert(e.code() == sycl::errc::build);
+      assert(std::string(e.what()).find("Parsing of user arguments failed") !=
+             std::string::npos);
+    }
+  };
+
+  CheckUnsupported({"-fsanitize=address"});
+  CheckUnsupported({"-Xsycl-target-frontend", "-fsanitize=address"});
+  CheckUnsupported({"-Xsycl-target-frontend=spir64", "-fsanitize=address"});
+  CheckUnsupported({"-Xarch_device", "-fsanitize=address"});
+}
+
 int main() {
 
 #ifdef SYCL_EXT_ONEAPI_KERNEL_COMPILER
   test_build_and_run();
+  test_unsupported_options();
 #else
   static_assert(false, "Kernel Compiler feature test macro undefined");
 #endif