Revert "[clang-sycl-linker] Fix flaky failure and add REQUIRES"

[sarnex]

Reverts #134125

[llvmbot]

@llvm/pr-subscribers-clang-driver

@llvm/pr-subscribers-clang

Author: Nick Sarnie (sarnex)

Changes

Reverts llvm/llvm-project#134125

---

Full diff: https://github.com/llvm/llvm-project/pull/134127.diff

4 Files Affected:

• (modified) clang/test/Driver/clang-sycl-linker-test.cpp (-2)
• (modified) clang/test/Driver/link-device-code.test (-2)
• (modified) clang/test/Driver/sycl-link-spirv-target.cpp (-2)
• (modified) clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp (-3)

diff --git a/clang/test/Driver/clang-sycl-linker-test.cpp b/clang/test/Driver/clang-sycl-linker-test.cpp
index c399689653784..2f860ae74e97d 100644
--- a/clang/test/Driver/clang-sycl-linker-test.cpp
+++ b/clang/test/Driver/clang-sycl-linker-test.cpp
@@ -1,7 +1,5 @@
 // Tests the clang-sycl-linker tool.
 //
-// REQUIRES: spirv-registered-target
-//
 // Test the dry run of a simple case to link two input files.
 // RUN: %clangxx -emit-llvm -c -target spirv64 %s -o %t_1.bc
 // RUN: %clangxx -emit-llvm -c -target spirv64 %s -o %t_2.bc
diff --git a/clang/test/Driver/link-device-code.test b/clang/test/Driver/link-device-code.test
index 231f02b6560e0..a5f52fdb7d9ae 100644
--- a/clang/test/Driver/link-device-code.test
+++ b/clang/test/Driver/link-device-code.test
@@ -1,5 +1,3 @@
-# REQUIRES: spirv-registered-target
-
 # RUN: llvm-as %S/Inputs/SYCL/foo.ll -o %t.foo.bc
 # RUN: llvm-as %S/Inputs/SYCL/bar.ll -o %t.bar.bc
 # RUN: llvm-as %S/Inputs/SYCL/baz.ll -o %t.baz.bc
diff --git a/clang/test/Driver/sycl-link-spirv-target.cpp b/clang/test/Driver/sycl-link-spirv-target.cpp
index 24206e38ad0a7..586adae619165 100644
--- a/clang/test/Driver/sycl-link-spirv-target.cpp
+++ b/clang/test/Driver/sycl-link-spirv-target.cpp
@@ -1,8 +1,6 @@
 // Tests the driver when linking LLVM IR bitcode files and targeting SPIR-V
 // architecture.
 //
-// REQUIRES: spirv-registered-target
-//
 // Test that -Xlinker options are being passed to clang-sycl-linker.
 // RUN: touch %t.bc
 // RUN: %clangxx -### --target=spirv64 --sycl-link -Xlinker -triple=spirv64 -Xlinker --library-path=/tmp \
diff --git a/clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp b/clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp
index 24a35b01a81a8..ab718c5a87c40 100644
--- a/clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp
+++ b/clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp
@@ -282,9 +282,6 @@ static Expected<StringRef> runSPIRVCodeGen(StringRef File, const ArgList &Args,
                                            LLVMContext &C) {
   llvm::TimeTraceScope TimeScope("SPIR-V code generation");
 
-  if (Error Err = M->materializeAll())
-    return std::move(Err);
-
   // Parse input module.
   SMDiagnostic Err;
   std::unique_ptr<Module> M = parseIRFile(File, Err, C);