[sycl-web] Undo bad conflict resolution and adjust tests to new upstr…

…eam behavior. (#15051) Signed-off-by: Marcos Maronas <marcos.maronas@intel.com>
intel · Aug 16, 2024 · 616728e · 616728e
1 parent 2b80605
commit 616728e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/clang/test/Driver/linker-wrapper-libs.c b/clang/test/Driver/linker-wrapper-libs.c
@@ -161,7 +161,7 @@ int bar() { return weak; }
 // RUN: --linker-path=/usr/bin/ld %t.o %t.a %t.a -o a.out 2>&1 \
 // RUN: | FileCheck %s --check-prefix=LIBRARY-GLOBAL-DEFINED
 
-// LIBRARY-GLOBAL-DEFINED: clang{{.*}} -o {{.*}}.img --target=nvptx64-nvidia-cuda -march=sm_70 {{.*}}.o {{.*}}.o
+// LIBRARY-GLOBAL-DEFINED: clang{{.*}} -o {{.*}}.img --target=nvptx64-nvidia-cuda -march=sm_70 {{.*}} {{.*}}.o
 // LIBRARY-GLOBAL-DEFINED-NOT: {{.*}}gfx1030{{.*}}.o
 // LIBRARY-GLOBAL-DEFINED: clang{{.*}} -o {{.*}}.img --target=amdgcn-amd-amdhsa -mcpu=gfx1030 {{.*}}.o {{.*}}.o
 
@@ -185,7 +185,7 @@ int bar() { return weak; }
 // RUN: --linker-path=/usr/bin/ld %t.o --whole-archive %t.a -o a.out 2>&1 \
 // RUN: | FileCheck %s --check-prefix=LIBRARY-WHOLE-ARCHIVE
 
-// LIBRARY-WHOLE-ARCHIVE: clang{{.*}} -o {{.*}}.img --target=nvptx64-nvidia-cuda -march=sm_70 {{.*}}.o {{.*}}.o
+// LIBRARY-WHOLE-ARCHIVE: clang{{.*}} -o {{.*}}.img --target=nvptx64-nvidia-cuda -march=sm_70 {{.*}} {{.*}}.o
 // LIBRARY-WHOLE-ARCHIVE: clang{{.*}} -o {{.*}}.img --target=amdgcn-amd-amdhsa -mcpu=gfx1030 {{.*}}.o {{.*}}.o
 // LIBRARY-WHOLE-ARCHIVE: clang{{.*}} -o {{.*}}.img --target=nvptx64-nvidia-cuda -march=sm_52 {{.*}}.o
 // LIBRARY-WHOLE-ARCHIVE: clang{{.*}} -o {{.*}}.img --target=amdgcn-amd-amdhsa -mcpu=gfx90a {{.*}}.o
diff --git a/clang/test/Driver/linker-wrapper.c b/clang/test/Driver/linker-wrapper.c
@@ -48,7 +48,7 @@ __attribute__((visibility("protected"), used)) int x;
 // RUN: clang-linker-wrapper --host-triple=x86_64-unknown-linux-gnu --dry-run --save-temps -O2 \
 // RUN: --linker-path=/usr/bin/ld %t.o -o a.out 2>&1 | FileCheck %s --check-prefix=AMDGPU-LTO-TEMPS
 
-// AMDGPU-LTO-TEMPS: clang{{.*}} -o {{.*}}.img --target=amdgcn-amd-amdhsa -mcpu=gfx1030 -O2 -Wl,--no-undefined {{.*}}.o -save-temps
+// AMDGPU-LTO-TEMPS: clang{{.*}} -o {{.*}}.img --target=amdgcn-amd-amdhsa -mcpu=gfx1030 -O2 -Wl,--no-undefined {{.*}} -save-temps
 
 // RUN: clang-offload-packager -o %t.out \
 // RUN: --image=file=%t.elf.o,kind=openmp,triple=x86_64-unknown-linux-gnu \

diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
@@ -2316,21 +2316,18 @@ Expected<SmallVector<StringRef>> linkAndWrapDeviceFiles(
  }
  }
 
- // Link the remaining device files using the device linker.
- auto OutputOrErr =
- !Args.hasArg(OPT_embed_bitcode) || linkerSupportsLTO(LinkerArgs)
- ? linkDevice(InputFiles, LinkerArgs)
- : InputFiles.front();
- if (!OutputOrErr)
- return OutputOrErr.takeError();
+ // TODO(NOM7): Remove this call and use community flow for bundle/wrap
+ auto OutputFile = sycl::runWrapperAndCompile(SplitModules, LinkerArgs);
+ if (!OutputFile)
+ return OutputFile.takeError();
 
  // SYCL offload kind images are all ready to be sent to host linker.
  // TODO: Currently, device code wrapping for SYCL offload happens in a
  // separate path inside 'linkDevice' call seen above.
  // This will eventually be refactored to use the 'common' wrapping logic
  // that is used for other offload kinds.
  std::scoped_lock Guard(ImageMtx);
- WrappedOutput.push_back(*OutputOrErr);
+ WrappedOutput.push_back(*OutputFile);
  }
  if (HasNonSYCLOffloadKinds) {
  // First link and remove all the input files containing bitcode.