Skip to content

Commit b1188f8

Browse files
authored
Revert "[clang-sycl-linker] Fix flaky failure and add REQUIRES (#134125)"
This reverts commit 4688719.
1 parent a57023b commit b1188f8

File tree

4 files changed

+0
-9
lines changed

4 files changed

+0
-9
lines changed

clang/test/Driver/clang-sycl-linker-test.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Tests the clang-sycl-linker tool.
22
//
3-
// REQUIRES: spirv-registered-target
4-
//
53
// Test the dry run of a simple case to link two input files.
64
// RUN: %clangxx -emit-llvm -c -target spirv64 %s -o %t_1.bc
75
// RUN: %clangxx -emit-llvm -c -target spirv64 %s -o %t_2.bc

clang/test/Driver/link-device-code.test

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# REQUIRES: spirv-registered-target
2-
31
# RUN: llvm-as %S/Inputs/SYCL/foo.ll -o %t.foo.bc
42
# RUN: llvm-as %S/Inputs/SYCL/bar.ll -o %t.bar.bc
53
# RUN: llvm-as %S/Inputs/SYCL/baz.ll -o %t.baz.bc

clang/test/Driver/sycl-link-spirv-target.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Tests the driver when linking LLVM IR bitcode files and targeting SPIR-V
22
// architecture.
33
//
4-
// REQUIRES: spirv-registered-target
5-
//
64
// Test that -Xlinker options are being passed to clang-sycl-linker.
75
// RUN: touch %t.bc
86
// RUN: %clangxx -### --target=spirv64 --sycl-link -Xlinker -triple=spirv64 -Xlinker --library-path=/tmp \

clang/tools/clang-sycl-linker/ClangSYCLLinker.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,6 @@ static Expected<StringRef> runSPIRVCodeGen(StringRef File, const ArgList &Args,
282282
LLVMContext &C) {
283283
llvm::TimeTraceScope TimeScope("SPIR-V code generation");
284284

285-
if (Error Err = M->materializeAll())
286-
return std::move(Err);
287-
288285
// Parse input module.
289286
SMDiagnostic Err;
290287
std::unique_ptr<Module> M = parseIRFile(File, Err, C);

0 commit comments

Comments
 (0)