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

[SYCL] Fix kernel-bundle-merge-options-env.cpp #1445

Merged
merged 2 commits into from
Dec 15, 2022
Merged

[SYCL] Fix kernel-bundle-merge-options-env.cpp #1445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa9c4a4
update
romanovvlad Dec 12, 2022
fa46a7b
changes
romanovvlad Dec 13, 2022
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
8 changes: 3 additions & 5 deletions SYCL/KernelAndProgram/kernel-bundle-merge-options-env.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,22 @@
// UNSUPPORTED: hip
// UNSUPPORTED: ze_debug-1,ze_debug4

// Temporary while the failure is being investigated.
// UNSUPPORTED: windows
#include "kernel-bundle-merge-options.hpp"

// CHECK: piProgramBuild
// CHECK-NEXT: <unknown>
// CHECK-NEXT: <unknown>
// CHECK-NEXT: <unknown>
// CHECK-NEXT: <const char *>:{{.*}}-DENV_COMPILE_OPTS{{.*}}-vc-codegen
// CHECK: <const char *>:{{[^bar]*}}-DENV_COMPILE_OPTS{{[^bar]*}}-DENV_LINK_OPTS{{[^bar]*}}
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have not found a better way to check that the string contains one word and doesn't contain another.


// CHECK: piProgramCompile(
// CHECK-NEXT: <unknown>
// CHECK-NEXT: <unknown>
// CHECK-NEXT: <unknown>
// CHECK-NEXT: <const char *>: -DENV_COMPILE_OPTS -vc-codegen
// CHECK: <const char *>:{{[^bar]*}}-DENV_COMPILE_OPTS{{[^bar]*}}

// CHECK: piProgramLink(
// CHECK-NEXT: <unknown>
// CHECK-NEXT: <unknown>
// CHECK-NEXT: <unknown>
// CHECK-NEXT: <const char *>: -DENV_LINK_OPTS
// CHECK: <const char *>:{{[^bar]*}}-DENV_LINK_OPTS{{[^bar]*}}
6 changes: 3 additions & 3 deletions SYCL/KernelAndProgram/kernel-bundle-merge-options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
// CHECK-NEXT: <unknown>
// CHECK-NEXT: <unknown>
// CHECK-NEXT: <unknown>
// CHECK-NEXT: <const char *>:{{.*}} -g {{.*}}-vc-codegen
// CHECK-NEXT: <const char *>:{{.*}}-g

// TODO: Uncomment when build options are properly passed to compile and link
// commands for kernel_bundle
// xCHECK: piProgramCompile(
// xCHECK-NEXT: <unknown>
// xCHECK-NEXT: <unknown>
// xCHECK-NEXT: <unknown>
// xCHECK-NEXT: <const char *>: -g -vc-codegen
// xCHECK-NEXT: <const char *>:{{.*}}-g
// xCHECK: piProgramLink(
// xCHECK-NEXT: <unknown>
// xCHECK-NEXT: <unknown>
// xCHECK-NEXT: <unknown>
// xCHECK-NEXT: <const char *>: -g -vc-codegen
// xCHECK-NEXT: <const char *>:{{.*}}-g
5 changes: 2 additions & 3 deletions SYCL/KernelAndProgram/kernel-bundle-merge-options.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define SYCL2020_DISABLE_DEPRECATION_WARNINGS
#include <sycl/ext/intel/esimd.hpp>

#include <sycl/sycl.hpp>

class KernelName;
Expand All @@ -16,8 +16,7 @@ int main() {

if (0)
Queue.submit([&](sycl::handler &CGH) {
CGH.single_task<KernelName>(
[=]() SYCL_ESIMD_KERNEL {}); // Actual kernel does not matter
CGH.single_task<KernelName>([=]() {}); // Actual kernel does not matter
});

try {
Expand Down