Skip to content

Commit d127523

Browse files
committed
Update test to specify correct inputs to clang-sycl-linker and update some comments
Signed-off-by: Arvind Sudarsanam <[email protected]>
1 parent 411bb3a commit d127523

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@
3030
// FILETYPEERROR: Unsupported file type
3131
//
3232
// Test to see if device library related errors are emitted.
33-
// RUN: not clang-sycl-linker --dry-run -triple spirv64 %t.bc --library-path=%T --device-libs= -o a.spv 2>&1 \
33+
// RUN: not clang-sycl-linker --dry-run -triple spirv64 %t_1.bc %t_2.bc --library-path=%T --device-libs= -o a.spv 2>&1 \
3434
// RUN: | FileCheck %s --check-prefix=DEVLIBSERR1
3535
// DEVLIBSERR1: Number of device library files cannot be zero
36-
// RUN: not clang-sycl-linker --dry-run -triple spirv64 %t.bc --library-path=%T --device-libs=lib1.bc,lib2.bc,lib3.bc -o a.spv 2>&1 \
36+
// RUN: not clang-sycl-linker --dry-run -triple spirv64 %t_1.bc %t_2.bc --library-path=%T --device-libs=lib1.bc,lib2.bc,lib3.bc -o a.spv 2>&1 \
3737
// RUN: | FileCheck %s --check-prefix=DEVLIBSERR2
3838
// DEVLIBSERR2: '{{.*}}lib3.bc' SYCL device library file is not found
3939
//
4040
// Test if correct set of llvm-spirv options are emitted for windows environment.
41-
// RUN: clang-sycl-linker --dry-run -triple spirv64 --is-windows-msvc-env %t.bc -o a.spv 2>&1 \
41+
// RUN: clang-sycl-linker --dry-run -triple spirv64 --is-windows-msvc-env %t_1.bc %t_2.bc -o a.spv 2>&1 \
4242
// RUN: | FileCheck %s --check-prefix=LLVMOPTSWIN
4343
// LLVMOPTSWIN: -spirv-debug-info-version=ocl-100 -spirv-allow-extra-diexpressions -spirv-allow-unknown-intrinsics=llvm.genx. -spirv-ext=
4444
//
4545
// Test if correct set of llvm-spirv options are emitted for linux environment.
46-
// RUN: clang-sycl-linker --dry-run -triple spirv64 %t.bc -o a.spv 2>&1 \
46+
// RUN: clang-sycl-linker --dry-run -triple spirv64 %t_1.bc %t_2.bc -o a.spv 2>&1 \
4747
// RUN: | FileCheck %s --check-prefix=LLVMOPTSLIN
4848
// LLVMOPTSLIN: -spirv-debug-info-version=nonsemantic-shader-200 -spirv-allow-unknown-intrinsics=llvm.genx. -spirv-ext=

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===---------------------------------------------------------------------===//
88
//
99
// This tool executes a sequence of steps required to link device code in SYCL
10-
// fat objects. SYCL device code linking requires a complex sequence of steps
10+
// device images. SYCL device code linking requires a complex sequence of steps
1111
// that include linking of llvm bitcode files, linking device library files
1212
// with the fully linked source bitcode file(s), running several SYCL specific
1313
// post-link steps on the fully linked bitcode file(s), and finally generating
@@ -189,7 +189,7 @@ Expected<SmallVector<std::string>> getInput(const ArgList &Args) {
189189
if (auto EC = identify_magic(*Filename, Magic))
190190
return createStringError("Failed to open file " + *Filename);
191191
// TODO: Current use case involves LLVM IR bitcode files as input.
192-
// This will be extended to support fat objects and SPIR-V IR files.
192+
// This will be extended to support objects and SPIR-V IR files.
193193
if (Magic != file_magic::bitcode)
194194
return createStringError("Unsupported file type");
195195
BitcodeFiles.push_back(*Filename);

0 commit comments

Comments
 (0)