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

[SYCL] [NFC] Follow-up #332 with comments fix #355

Merged
merged 1 commit into from
Jul 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion SYCL/AOT/multiple-devices.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
// RUN: %ACC_RUN_PLACEHOLDER %t_all.out

// FIXME: Change the behavior when proper automation for assert support is
// introduced
// introduced. For the time being, AOT flow can't detect if specific extension
// is available for this or that device. The automation to be introduced is to
// query native binary generator on specific features.
//
// Produce object file, spirv, device images to combine these differently
// at link-time, thus testing various AOT-compiled images configurations
// RUN: %clangxx -fsycl %S/Inputs/aot.cpp -c -o %t.o
Expand Down
11 changes: 6 additions & 5 deletions SYCL/Basic/device_code_dae.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
// driver
// UNSUPPORTED: cuda
// CUDA does not support SPIR-V.
// FIXME Disabled fallback assert as it'll require either online linking or
// explicit offline linking step here
// 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
// 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
// RUN: llvm-link -o=linked_device_code.bc device_code.bc
// 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
// RUN: %clangxx %cxx_std_optionc++17 %include_option int_header.h %debug_option -c %s -o host_code.o %sycl_options -Wno-sycl-strict
// FIXME Added explicit offline linking step here until online-linking support
// is fixed
// RUN: %llvm_spirv -r %sycl_libs_dir/libsycl-fallback-cassert.spv -o=%T/fallback-cassert.bc
// RUN: llvm-link -o=linked_device_code.bc device_code.bc %T/fallback-cassert.bc
// RUN: sycl-post-link -emit-param-info linked_device_code.bc
// RUN: llvm-spirv -o linked_device_code.spv linked_device_code.bc
// RUN: echo -e -n "[Code|Properties]\nlinked_device_code.spv|linked_device_code_0.prop" > table.txt
Expand Down
5 changes: 4 additions & 1 deletion SYCL/Basic/fpga_tests/fpga_aocx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
// Produce an archive with device (AOCX) image. To avoid appending objects to
// leftover archives, remove one if exists.
// FIXME Disabled use of devicelib by assert feature until the 2-step build gets
// fixed.
// fixed. For the time being when 2-step build is employed and there's a call to
// devicelib function from kernel, the binary image gets corrupted. Due to
// fallback assert implementation adds a kernel with appropriate call, we have
// it disabled for this test.
// RUN: rm %t_image.a || true
// RUN: %clangxx -DSYCL_DISABLE_FALLBACK_ASSERT=1 -fsycl -fintelfpga -fsycl-link=image %S/Inputs/fpga_device.cpp -o %t_image.a
// Produce a host object
Expand Down
5 changes: 4 additions & 1 deletion SYCL/Basic/fpga_tests/fpga_aocx_win.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
// Produce an archive with device (AOCX) image. To avoid appending objects to
// leftover archives, remove one if exists.
// FIXME Disabled use of devicelib by assert feature until the 2-step build gets
// fixed.
// fixed. For the time being when 2-step build is employed and there's a call to
// devicelib function from kernel, the binary image gets corrupted. Due to
// fallback assert implementation adds a kernel with appropriate call, we have
// it disabled for this test.
// RUN: rm %t_image.a || true
// RUN: %clangxx -DSYCL_DISABLE_FALLBACK_ASSERT=1 -fsycl -fintelfpga -fsycl-link=image %S/Inputs/fpga_device.cpp -o %t_image.lib
// Produce a host object
Expand Down