Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit 2dbf5fa

Browse files
author
sergei
authored
[SYCL] [NFC] Follow-up #332 with comments fix (#355)
Signed-off-by: Sergey Kanaev <[email protected]>
1 parent c837a1e commit 2dbf5fa

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

SYCL/AOT/multiple-devices.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
// RUN: %ACC_RUN_PLACEHOLDER %t_all.out
2020

2121
// FIXME: Change the behavior when proper automation for assert support is
22-
// introduced
22+
// introduced. For the time being, AOT flow can't detect if specific extension
23+
// is available for this or that device. The automation to be introduced is to
24+
// query native binary generator on specific features.
25+
//
2326
// Produce object file, spirv, device images to combine these differently
2427
// at link-time, thus testing various AOT-compiled images configurations
2528
// RUN: %clangxx -fsycl %S/Inputs/aot.cpp -c -o %t.o

SYCL/Basic/device_code_dae.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
// driver
33
// UNSUPPORTED: cuda
44
// CUDA does not support SPIR-V.
5-
// FIXME Disabled fallback assert as it'll require either online linking or
6-
// explicit offline linking step here
7-
// RUN: %clangxx -DSYCL_DISABLE_FALLBACK_ASSERT -fsycl-device-only -Xclang -fenable-sycl-dae -Xclang -fsycl-int-header=int_header.h %s -c -o device_code.bc -Wno-sycl-strict
8-
// RUN: %clangxx -DSYCL_DISABLE_FALLBACK_ASSERT %cxx_std_optionc++17 %include_option int_header.h %debug_option -c %s -o host_code.o %sycl_options -Wno-sycl-strict
9-
// RUN: llvm-link -o=linked_device_code.bc device_code.bc
5+
// RUN: %clangxx -fsycl-device-only -Xclang -fenable-sycl-dae -Xclang -fsycl-int-header=int_header.h %s -c -o device_code.bc -Wno-sycl-strict
6+
// RUN: %clangxx %cxx_std_optionc++17 %include_option int_header.h %debug_option -c %s -o host_code.o %sycl_options -Wno-sycl-strict
7+
// FIXME Added explicit offline linking step here until online-linking support
8+
// is fixed
9+
// RUN: %llvm_spirv -r %sycl_libs_dir/libsycl-fallback-cassert.spv -o=%T/fallback-cassert.bc
10+
// RUN: llvm-link -o=linked_device_code.bc device_code.bc %T/fallback-cassert.bc
1011
// RUN: sycl-post-link -emit-param-info linked_device_code.bc
1112
// RUN: llvm-spirv -o linked_device_code.spv linked_device_code.bc
1213
// RUN: echo -e -n "[Code|Properties]\nlinked_device_code.spv|linked_device_code_0.prop" > table.txt

SYCL/Basic/fpga_tests/fpga_aocx.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
// Produce an archive with device (AOCX) image. To avoid appending objects to
1313
// leftover archives, remove one if exists.
1414
// FIXME Disabled use of devicelib by assert feature until the 2-step build gets
15-
// fixed.
15+
// fixed. For the time being when 2-step build is employed and there's a call to
16+
// devicelib function from kernel, the binary image gets corrupted. Due to
17+
// fallback assert implementation adds a kernel with appropriate call, we have
18+
// it disabled for this test.
1619
// RUN: rm %t_image.a || true
1720
// RUN: %clangxx -DSYCL_DISABLE_FALLBACK_ASSERT=1 -fsycl -fintelfpga -fsycl-link=image %S/Inputs/fpga_device.cpp -o %t_image.a
1821
// Produce a host object

SYCL/Basic/fpga_tests/fpga_aocx_win.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
// Produce an archive with device (AOCX) image. To avoid appending objects to
1414
// leftover archives, remove one if exists.
1515
// FIXME Disabled use of devicelib by assert feature until the 2-step build gets
16-
// fixed.
16+
// fixed. For the time being when 2-step build is employed and there's a call to
17+
// devicelib function from kernel, the binary image gets corrupted. Due to
18+
// fallback assert implementation adds a kernel with appropriate call, we have
19+
// it disabled for this test.
1720
// RUN: rm %t_image.a || true
1821
// RUN: %clangxx -DSYCL_DISABLE_FALLBACK_ASSERT=1 -fsycl -fintelfpga -fsycl-link=image %S/Inputs/fpga_device.cpp -o %t_image.lib
1922
// Produce a host object

0 commit comments

Comments
 (0)