From f3e55ce2cef0701b4b318d9394991f3aa676cfef Mon Sep 17 00:00:00 2001 From: Vladimir Lazarev Date: Wed, 16 Sep 2020 10:32:06 +0300 Subject: [PATCH 1/2] [SYCL] Fix LIT regression after 9dd18ca8 --- clang/test/Driver/sycl-intelfpga-static-lib.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/test/Driver/sycl-intelfpga-static-lib.cpp b/clang/test/Driver/sycl-intelfpga-static-lib.cpp index 510684ddaed7f..1a77afd98465a 100644 --- a/clang/test/Driver/sycl-intelfpga-static-lib.cpp +++ b/clang/test/Driver/sycl-intelfpga-static-lib.cpp @@ -10,7 +10,7 @@ // RUN: llvm-ar cr %t.a %t1_bundle.o /// Check phases with static lib -// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fintelfpga %t.a -ccc-print-phases 2>&1 \ +// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-device-lib=all -fintelfpga %t.a -ccc-print-phases 2>&1 \ // RUN: | FileCheck -check-prefix=CHECK_PHASES %s // CHECK_PHASES: 0: input, "[[INPUT:.+\.a]]", object, (host-sycl) // CHECK_PHASES: 1: linker, {0}, image, (host-sycl) @@ -27,7 +27,7 @@ // CHECK_PHASES: 12: offload, "host-sycl (x86_64-unknown-linux-gnu)" {1}, "device-sycl (spir64_fpga-unknown-unknown-sycldevice)" {11}, image /// Check for unbundle and use of deps in static lib -// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fintelfpga %t.a -### 2>&1 \ +// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-device-lib=all -fintelfpga %t.a -### 2>&1 \ // RUN: | FileCheck -check-prefix=CHECK_UNBUNDLE %s // CHECK_UNBUNDLE: clang-offload-bundler" "-type=aoo" "-targets=sycl-fpga_dep" "-inputs={{.*}}" "-outputs=[[DEPFILES:.+\.txt]]" "-unbundle" // CHECK_UNBUNDLE: aoc{{.*}} "-dep-files=@[[DEPFILES]]" From cbbeb4c562fbb7e82dc740a213a1ac469fcf757b Mon Sep 17 00:00:00 2001 From: Vladimir Lazarev Date: Wed, 16 Sep 2020 11:52:09 +0300 Subject: [PATCH 2/2] [SYCL] fix windows specific test --- clang/test/Driver/sycl-intelfpga-static-lib-win.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/test/Driver/sycl-intelfpga-static-lib-win.cpp b/clang/test/Driver/sycl-intelfpga-static-lib-win.cpp index 2f61c8d9567d4..1f55ecd8921ff 100644 --- a/clang/test/Driver/sycl-intelfpga-static-lib-win.cpp +++ b/clang/test/Driver/sycl-intelfpga-static-lib-win.cpp @@ -11,7 +11,7 @@ // RUN: lib -out:%t.lib %t1_bundle.obj /// Check phases with static lib -// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fsycl -fintelfpga %t.lib -ccc-print-phases 2>&1 \ +// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fsycl -fno-sycl-device-lib=all -fintelfpga %t.lib -ccc-print-phases 2>&1 \ // RUN: | FileCheck -check-prefix=CHECK_PHASES %s // CHECK_PHASES: 0: input, "[[INPUT:.+\.lib]]", object, (host-sycl) // CHECK_PHASES: 1: linker, {0}, image, (host-sycl) @@ -27,7 +27,7 @@ // CHECK_PHASES: 11: offload, "host-sycl (x86_64-pc-windows-msvc)" {1}, "device-sycl (spir64_fpga-unknown-unknown-sycldevice)" {10}, image /// Check for unbundle and use of deps in static lib -// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fsycl -fintelfpga %t.lib -### 2>&1 \ +// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fsycl -fno-sycl-device-lib=all -fintelfpga %t.lib -### 2>&1 \ // RUN: | FileCheck -check-prefix=CHECK_UNBUNDLE %s // CHECK_UNBUNDLE: clang-offload-bundler" "-type=aoo" "-targets=sycl-fpga_dep" "-inputs={{.*}}" "-outputs=[[DEPFILES:.+\.txt]]" "-unbundle" // CHECK_UNBUNDLE: aoc{{.*}} "-dep-files=@[[DEPFILES]]"