Skip to content

Commit a8d7b9a

Browse files
committed
Fixed help message, fix more tests
Signed-off-by: Konstantin S Bobrovsky <[email protected]>
1 parent 198c42a commit a8d7b9a

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

llvm/test/tools/sycl-post-link/sycl-esimd/sycl-esimd-split-per-source.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ attributes #1 = { "sycl-module-id"="b.cpp" }
6868
; CHECK: [Code|Properties]
6969
; CHECK-DAG: {{.*}}tmp_0.ll|{{.*}}_0.prop
7070
; CHECK-DAG: {{.*}}tmp_1.ll|{{.*}}_1.prop
71-
; CHECK-DAG: {{.*}}tmp_esimd_2.ll|{{.*}}_esimd_2.prop
72-
; CHECK-DAG: {{.*}}tmp_esimd_3.ll|{{.*}}_esimd_3.prop
71+
; CHECK-DAG: {{.*}}tmp_esimd_0.ll|{{.*}}_esimd_0.prop
72+
; CHECK-DAG: {{.*}}tmp_esimd_1.ll|{{.*}}_esimd_1.prop
7373

7474
; CHECK-SYCL-IR-0-DAG: define dso_local spir_kernel void @SYCL_kernel1()
7575
; CHECK-SYCL-IR-0-DAG: define dso_local spir_kernel void @SYCL_kernel2()

llvm/test/tools/sycl-post-link/sycl-external-funcs/split-per-source1.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
; attribute with splitting in per-source mode.
33

44
; RUN: sycl-post-link -split=source -symbols -S %s -o %t.table
5-
; RUN: FileCheck %s -input-file=%t_0.ll --check-prefixes CHECK-IR1
6-
; RUN: FileCheck %s -input-file=%t_1.ll --check-prefixes CHECK-IR2
7-
; RUN: FileCheck %s -input-file=%t_0.sym --check-prefixes CHECK-SYM1
8-
; RUN: FileCheck %s -input-file=%t_1.sym --check-prefixes CHECK-SYM2
5+
; RUN: FileCheck %s -input-file=%t_0.ll --check-prefixes CHECK-IR2
6+
; RUN: FileCheck %s -input-file=%t_0.sym --check-prefixes CHECK-SYM2
7+
; RUN: FileCheck %s -input-file=%t_1.ll --check-prefixes CHECK-IR1
8+
; RUN: FileCheck %s -input-file=%t_1.sym --check-prefixes CHECK-SYM1
99

1010
; RUN: sycl-post-link -split=source -emit-only-kernels-as-entry-points -symbols -S %s -o %t.table
1111
; RUN: FileCheck %s -input-file=%t_0.sym --check-prefixes CHECK-SYM2

llvm/test/tools/sycl-post-link/sycl-external-funcs/split-per-source2.ll

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
; sycl-module-id attribute with splitting in per-source mode.
33

44
; RUN: sycl-post-link -split=source -symbols -S %s -o %t.table
5-
; RUN: FileCheck %s -input-file=%t_0.ll --check-prefixes CHECK-IR1
6-
; RUN: FileCheck %s -input-file=%t_1.ll --check-prefixes CHECK-IR2
7-
; RUN: FileCheck %s -input-file=%t_0.sym --check-prefixes CHECK-SYM1
8-
; RUN: FileCheck %s -input-file=%t_1.sym --check-prefixes CHECK-SYM2
5+
; RUN: FileCheck %s -input-file=%t_0.ll --check-prefixes CHECK-IR0
6+
; RUN: FileCheck %s -input-file=%t_0.sym --check-prefixes CHECK-SYM0
7+
; RUN: FileCheck %s -input-file=%t_1.ll --check-prefixes CHECK-IR1
8+
; RUN: FileCheck %s -input-file=%t_1.sym --check-prefixes CHECK-SYM1
99

1010
; RUN: sycl-post-link -split=source -emit-only-kernels-as-entry-points -symbols -S %s -o %t.table
11-
; RUN: FileCheck %s -input-file=%t_0.sym --check-prefixes CHECK-SYM2
11+
; RUN: FileCheck %s -input-file=%t_0.sym --check-prefixes CHECK-SYM0
1212
; RUN: FileCheck %s -input-file=%t.table --check-prefixes CHECK-TABLE
1313
; CHECK-TABLE: [Code|Properties|Symbols]
1414
; CHECK-TABLE-NEXT: {{.*}}.ll|{{.*}}_0.prop|{{.*}}_0.sym
@@ -31,10 +31,10 @@ attributes #0 = { "sycl-module-id"="a.cpp" }
3131
attributes #1 = { "sycl-module-id"="b.cpp" }
3232

3333
; CHECK-IR1: define dso_local spir_func void @externalDeviceFunc()
34-
; CHECK-IR2: define dso_local spir_func void @externalDeviceFunc()
35-
; CHECK-IR2: define dso_local spir_kernel void @kernel1()
34+
; CHECK-IR0: define dso_local spir_func void @externalDeviceFunc()
35+
; CHECK-IR0: define dso_local spir_kernel void @kernel1()
3636

3737
; CHECK-SYM1: externalDeviceFunc
3838
; CHECK-SYM1-EMPTY:
39-
; CHECK-SYM2: kernel1
40-
; CHECK-SYM2-EMPTY:
39+
; CHECK-SYM0: kernel1
40+
; CHECK-SYM0-EMPTY:

llvm/tools/sycl-post-link/sycl-post-link.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -806,8 +806,10 @@ int main(int argc, char **argv) {
806806
" '-split=auto' mode automatically selects the best way of splitting\n"
807807
" kernels into modules based on some heuristic.\n"
808808
" The '-split' option is compatible with '-split-esimd'. In this case,\n"
809-
" first input module will be split into SYCL and ESIMD modules. Then\n"
810-
" both modules will be further split according to the '-split' option.\n"
809+
" first input module will be split according to the '-split' option\n"
810+
" processing algorithm, not distinguishing between SYCL and ESIMD\n"
811+
" kernels. Then each resulting module is further split into SYCL and\n"
812+
" ESIMD parts if the module has both kinds of entry points.\n"
811813
"- If -symbols options is also specified, then for each produced module\n"
812814
" a text file containing names of all spir kernels in it is generated.\n"
813815
"- Specialization constant intrinsic transformer. Replaces symbolic\n"

0 commit comments

Comments
 (0)