[NFC][SYCL][SYCLLowerIR] Add cl::opt SpecConstantMode for LIT testing #15821

wenju-he · 2024-10-23T01:54:37Z

This allows testing SpecConstantsPass with different modes.

wenju-he · 2024-10-23T02:55:34Z

3 failed sycl e2e tests in SYCL Pre Commit on Linux / test (Intel, ["Linux", "gen12"] have Invalid device error, which is probably unrelated to this PR.

Failed Tests (3):
  SYCL :: AOT/double.cpp
  SYCL :: AOT/half.cpp
  SYCL :: AOT/reqd-sg-size.cpp

******************** TEST 'SYCL :: AOT/double.cpp' FAILED ********************
Exit Code: 1

Command Output (stdout):
--
# RUN: at line 5
/__w/llvm/llvm/toolchain/bin//clang++  -Werror  -fsycl -fsycl-targets=intel_gpu_tgllp -o /__w/llvm/llvm/build-e2e/AOT/Output/double.cpp.tmp.tgllp.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/double.cpp
# executed command: /__w/llvm/llvm/toolchain/bin//clang++ -Werror -fsycl -fsycl-targets=intel_gpu_tgllp -o /__w/llvm/llvm/build-e2e/AOT/Output/double.cpp.tmp.tgllp.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/double.cpp
# note: command had no output on stdout or stderr
# RUN: at line 6
/__w/llvm/llvm/toolchain/bin//clang++  -Werror  -fsycl -fsycl-targets=spir64_x86_64 -o /__w/llvm/llvm/build-e2e/AOT/Output/double.cpp.tmp.x86.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/double.cpp
# executed command: /__w/llvm/llvm/toolchain/bin//clang++ -Werror -fsycl -fsycl-targets=spir64_x86_64 -o /__w/llvm/llvm/build-e2e/AOT/Output/double.cpp.tmp.x86.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/double.cpp
# note: command had no output on stdout or stderr
# RUN: at line 7 has no command after substitutions
# RUN: at line 7 has no command after substitutions
# RUN: at line 7
env ONEAPI_DEVICE_SELECTOR=opencl:cpu  /__w/llvm/llvm/build-e2e/AOT/Output/double.cpp.tmp.x86.out
# executed command: env ONEAPI_DEVICE_SELECTOR=opencl:cpu /__w/llvm/llvm/build-e2e/AOT/Output/double.cpp.tmp.x86.out
# .---command stdout------------
# | 5
# `-----------------------------
# RUN: at line 12
/__w/llvm/llvm/toolchain/bin//clang++  -Werror  -fsycl -fsycl-targets=intel_gpu_cfl -o /__w/llvm/llvm/build-e2e/AOT/Output/double.cpp.tmp.cfl.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/double.cpp
# executed command: /__w/llvm/llvm/toolchain/bin//clang++ -Werror -fsycl -fsycl-targets=intel_gpu_cfl -o /__w/llvm/llvm/build-e2e/AOT/Output/double.cpp.tmp.cfl.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/double.cpp
# .---command stdout------------
# | Could not determine device target: cfl.
# | Error: Cannot get HW Info for device cfl.
# | Invalid device error, trying to fallback to former ocloc libocloc_legacy1.so
# | Couldn't load former ocloc libocloc_legacy1.so
# | Command was: /usr/bin/ocloc -output /tmp/lit-tmp-mk_n9huv/double-cfl-66975a-435f34.out -file /tmp/lit-tmp-mk_n9huv/double-cfl-20b79e-ea7072.spv -output_no_suffix -spirv_input -device cfl
# `-----------------------------
# .---command stderr------------
# | llvm-foreach: 
# | clang++: error: gen compiler command failed with exit code 223 (use -v to see invocation)
# | clang version 20.0.0git (https://github.com/intel/llvm 522bbe86a5c2b203ed0faababdb458b009d3ae49)
# | Target: x86_64-unknown-linux-gnu
# | Thread model: posix
# | InstalledDir: /__w/llvm/llvm/toolchain/bin
# | Build config: +assertions
# | clang++: note: diagnostic msg: Error generating preprocessed source(s).
# `-----------------------------
# error: command failed with exit status: 1

--

********************
FAIL: SYCL :: AOT/half.cpp (63 of 2226)
******************** TEST 'SYCL :: AOT/half.cpp' FAILED ********************
Exit Code: 1

Command Output (stdout):
--
# RUN: at line 5
/__w/llvm/llvm/toolchain/bin//clang++  -Werror  -fsycl -fsycl-targets=intel_gpu_tgllp -o /__w/llvm/llvm/build-e2e/AOT/Output/half.cpp.tmp.tgllp.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/half.cpp
# executed command: /__w/llvm/llvm/toolchain/bin//clang++ -Werror -fsycl -fsycl-targets=intel_gpu_tgllp -o /__w/llvm/llvm/build-e2e/AOT/Output/half.cpp.tmp.tgllp.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/half.cpp
# .---command stdout------------
# | Compilation from IR - skipping loading of FCL
# | Build succeeded.
# `-----------------------------
# RUN: at line 6
/__w/llvm/llvm/toolchain/bin//clang++  -Werror  -fsycl -fsycl-targets=spir64_x86_64 -o /__w/llvm/llvm/build-e2e/AOT/Output/half.cpp.tmp.x86.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/half.cpp
# executed command: /__w/llvm/llvm/toolchain/bin//clang++ -Werror -fsycl -fsycl-targets=spir64_x86_64 -o /__w/llvm/llvm/build-e2e/AOT/Output/half.cpp.tmp.x86.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/half.cpp
# note: command had no output on stdout or stderr
# RUN: at line 7 has no command after substitutions
# RUN: at line 7 has no command after substitutions
# RUN: at line 7
env ONEAPI_DEVICE_SELECTOR=opencl:cpu  /__w/llvm/llvm/build-e2e/AOT/Output/half.cpp.tmp.x86.out
# executed command: env ONEAPI_DEVICE_SELECTOR=opencl:cpu /__w/llvm/llvm/build-e2e/AOT/Output/half.cpp.tmp.x86.out
# .---command stdout------------
# | 5
# `-----------------------------
# RUN: at line 12
/__w/llvm/llvm/toolchain/bin//clang++  -Werror  -fsycl -fsycl-targets=intel_gpu_cfl -o /__w/llvm/llvm/build-e2e/AOT/Output/half.cpp.tmp.cfl.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/half.cpp
# executed command: /__w/llvm/llvm/toolchain/bin//clang++ -Werror -fsycl -fsycl-targets=intel_gpu_cfl -o /__w/llvm/llvm/build-e2e/AOT/Output/half.cpp.tmp.cfl.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/half.cpp
# .---command stdout------------
# | Could not determine device target: cfl.
# | Error: Cannot get HW Info for device cfl.
# | Invalid device error, trying to fallback to former ocloc libocloc_legacy1.so
# | Couldn't load former ocloc libocloc_legacy1.so
# | Command was: /usr/bin/ocloc -output /tmp/lit-tmp-mk_n9huv/half-cfl-[40](https://github.com/intel/llvm/actions/runs/11471577595/job/31923077136?pr=15821#step:22:41)c7c8-2c9a4f.out -file /tmp/lit-tmp-mk_n9huv/half-cfl-b4e61b-228ac4.spv -output_no_suffix -spirv_input -device cfl
# `-----------------------------
# .---command stderr------------
# | llvm-foreach: 
# | clang++: error: gen compiler command failed with exit code 223 (use -v to see invocation)
# | clang version 20.0.0git (https://github.com/intel/llvm 522bbe86a5c2b203ed0faababdb458b009d3ae49)
# | Target: x86_64-unknown-linux-gnu
# | Thread model: posix
# | InstalledDir: /__w/llvm/llvm/toolchain/bin
# | Build config: +assertions
# | clang++: note: diagnostic msg: Error generating preprocessed source(s).
# `-----------------------------
# error: command failed with exit status: 1

--

********************
FAIL: SYCL :: AOT/reqd-sg-size.cpp (67 of 2226)
******************** TEST 'SYCL :: AOT/reqd-sg-size.cpp' FAILED ********************
Exit Code: 1

Command Output (stdout):
--
# RUN: at line 5
/__w/llvm/llvm/toolchain/bin//clang++  -Werror  -fsycl -fsycl-targets=intel_gpu_tgllp -o /__w/llvm/llvm/build-e2e/AOT/Output/reqd-sg-size.cpp.tmp.tgllp.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/reqd-sg-size.cpp
# executed command: /__w/llvm/llvm/toolchain/bin//clang++ -Werror -fsycl -fsycl-targets=intel_gpu_tgllp -o /__w/llvm/llvm/build-e2e/AOT/Output/reqd-sg-size.cpp.tmp.tgllp.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/reqd-sg-size.cpp
# .---command stdout------------
# | Compilation from IR - skipping loading of FCL
# | Build succeeded.
# | Compilation from IR - skipping loading of FCL
# | Build succeeded.
# | Compilation from IR - skipping loading of FCL
# | Build succeeded.
# `-----------------------------
# RUN: at line 6
/__w/llvm/llvm/toolchain/bin//clang++  -Werror  -fsycl -fsycl-targets=spir64_x86_64 -o /__w/llvm/llvm/build-e2e/AOT/Output/reqd-sg-size.cpp.tmp.x86.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/reqd-sg-size.cpp
# executed command: /__w/llvm/llvm/toolchain/bin//clang++ -Werror -fsycl -fsycl-targets=spir64_x86_64 -o /__w/llvm/llvm/build-e2e/AOT/Output/reqd-sg-size.cpp.tmp.x86.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/reqd-sg-size.cpp
# note: command had no output on stdout or stderr
# RUN: at line 11
/__w/llvm/llvm/toolchain/bin//clang++  -Werror  -fsycl -fsycl-targets=intel_gpu_cfl -o /__w/llvm/llvm/build-e2e/AOT/Output/reqd-sg-size.cpp.tmp.cfl.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/reqd-sg-size.cpp
# executed command: /__w/llvm/llvm/toolchain/bin//clang++ -Werror -fsycl -fsycl-targets=intel_gpu_cfl -o /__w/llvm/llvm/build-e2e/AOT/Output/reqd-sg-size.cpp.tmp.cfl.out /__w/llvm/llvm/llvm/sycl/test-e2e/AOT/reqd-sg-size.cpp
# .---command stdout------------
# | Could not determine device target: cfl.
# | Error: Cannot get HW Info for device cfl.
# | Invalid device error, trying to fallback to former ocloc libocloc_legacy1.so
# | Couldn't load former ocloc libocloc_legacy1.so
# | Command was: /usr/bin/ocloc -output /tmp/lit-tmp-mk_n9huv/reqd-sg-size-cfl-3604aa-d4e8[42](https://github.com/intel/llvm/actions/runs/11471577595/job/31923077136?pr=15821#step:22:43).out -file /tmp/lit-tmp-mk_n9huv/reqd-sg-size-cfl-1d8c5f-a0cd4a.spv -output_no_suffix -spirv_input -device cfl
# | Could not determine device target: cfl.
# | Error: Cannot get HW Info for device cfl.
# | Invalid device error, trying to fallback to former ocloc libocloc_legacy1.so
# | Couldn't load former ocloc libocloc_legacy1.so
# | Command was: /usr/bin/ocloc -output /tmp/lit-tmp-mk_n9huv/reqd-sg-size-cfl-3604aa-c19a59.out -file /tmp/lit-tmp-mk_n9huv/reqd-sg-size-cfl-1d8c5f-5afed6.spv -output_no_suffix -spirv_input -device cfl
# | Could not determine device target: cfl.
# | Error: Cannot get HW Info for device cfl.
# | Invalid device error, trying to fallback to former ocloc libocloc_legacy1.so
# | Couldn't load former ocloc libocloc_legacy1.so
# | Command was: /usr/bin/ocloc -output /tmp/lit-tmp-mk_n9huv/reqd-sg-size-cfl-3604aa-b2d7d6.out -file /tmp/lit-tmp-mk_n9huv/reqd-sg-size-cfl-1d8c5f-54ac6d.spv -output_no_suffix -spirv_input -device cfl
# `-----------------------------
# .---command stderr------------
# | llvm-foreach: 
# | llvm-foreach: 
# | llvm-foreach: 
# | clang++: error: gen compiler command failed with exit code 223 (use -v to see invocation)
# | clang version 20.0.0git (https://github.com/intel/llvm 522bbe86a5c2b203ed0faababdb[45](https://github.com/intel/llvm/actions/runs/11471577595/job/31923077136?pr=15821#step:22:46)8b009d3ae49)
# | Target: x86_64-unknown-linux-gnu
# | Thread model: posix
# | InstalledDir: /__w/llvm/llvm/toolchain/bin
# | Build config: +assertions
# | clang++: note: diagnostic msg: Error generating preprocessed source(s).
# `-----------------------------
# error: command failed with exit status: 1

--

llvm/lib/SYCLLowerIR/SpecConstants.cpp

asudarsa · 2024-10-23T22:04:12Z

llvm/lib/SYCLLowerIR/SpecConstants.cpp

@@ -29,6 +29,19 @@

 using namespace llvm;

+static cl::opt<SpecConstantsPass::HandlingMode> SpecConstantMode(
+ "spec-constant-mode", cl::Optional, cl::Hidden,
+ cl::desc("Spec constant handling mode"),


Suggested change

cl::desc("Spec constant handling mode"),

cl::desc("Specialization constant handling mode"),

asudarsa · 2024-10-23T22:04:32Z

llvm/lib/SYCLLowerIR/SpecConstants.cpp

+ cl::values(
+ clEnumValN(SpecConstantsPass::HandlingMode::default_values,
+ "default_values",
+ "spec constant uses are replaced by default values"),


Suggested change

"spec constant uses are replaced by default values"),

"Specialization constant uses are replaced by default values"),

asudarsa · 2024-10-23T22:05:05Z

llvm/lib/SYCLLowerIR/SpecConstants.cpp

+ "default_values",
+ "spec constant uses are replaced by default values"),
+ clEnumValN(SpecConstantsPass::HandlingMode::emulation, "emulation",
+ "spec constant intrinsics are replaced by RT buffers"),


Suggested change

"spec constant intrinsics are replaced by RT buffers"),

"Specialization constant intrinsics are replaced by run-time buffers"),

asudarsa · 2024-10-23T22:05:26Z

llvm/lib/SYCLLowerIR/SpecConstants.cpp

+ "spec constant intrinsics are replaced by RT buffers"),
+ clEnumValN(
+ SpecConstantsPass::HandlingMode::native, "native",
+ "spec constant intrinsics are lowered to spirv intrinsics")));


Suggested change

"spec constant intrinsics are lowered to spirv intrinsics")));

"Specialization constant intrinsics are lowered to SPIR-V intrinsics")));

asudarsa · 2024-10-23T22:09:32Z

llvm/test/SYCLLowerIR/SpecConstants/SYCL-alloca.ll

@@ -1,7 +1,6 @@
-; RUN: sycl-post-link -properties -split=auto -spec-const=native -S -o %t.table %s -generate-device-image-default-spec-consts


Is the sycl-post-link test not expected to work anymore? I somehow feel it will be better to add a new test here.

sycl-post-link test is still expected to work.
This test was only checking output of SpecConstantPass, while other tests in llvm/test/tools/sycl-post-link/ folder are also checking sycl-post-link tool output. So I move this test into llvm/test/SYCLLowerIR/SpecConstants/SYCL-alloca.ll

After reading your comment, I also feel it is better to keep the test to check sycl-post-link is correctly passing parameters to SpecConstantPass. So I added it back in the second commit.

asudarsa · 2024-10-23T22:11:57Z

llvm/lib/SYCLLowerIR/SpecConstants.cpp

@@ -29,6 +29,19 @@

 using namespace llvm;

+static cl::opt<SpecConstantsPass::HandlingMode> SpecConstantMode(


is there a default value that can be set here?

added default value: cl::init(SpecConstantsPass::HandlingMode::emulation)

asudarsa

Looks good overall. Just a few suggestions.

Thanks

asudarsa

Thanks for the updates. LGTM.

wenju-he · 2024-10-24T05:04:30Z

@intel/llvm-gatekeepers please merge, thanks

[NFC][SYCL][SYCLLowerIR] Add cl::opt SpecConstantMode for LIT testing

87eb7a4

This allows testing SpecConstantsPass with different modes.

wenju-he requested a review from a team as a code owner October 23, 2024 01:54

wenju-he temporarily deployed to WindowsCILock October 23, 2024 01:54 — with GitHub Actions Inactive

wenju-he temporarily deployed to WindowsCILock October 23, 2024 02:42 — with GitHub Actions Inactive

asudarsa reviewed Oct 23, 2024

View reviewed changes

llvm/lib/SYCLLowerIR/SpecConstants.cpp Show resolved Hide resolved

asudarsa reviewed Oct 23, 2024

View reviewed changes

init value, update comment, add back sycl-post-link test

98079ae

wenju-he temporarily deployed to WindowsCILock October 24, 2024 01:00 — with GitHub Actions Inactive

wenju-he requested a review from asudarsa October 24, 2024 01:05

wenju-he temporarily deployed to WindowsCILock October 24, 2024 01:47 — with GitHub Actions Inactive

asudarsa approved these changes Oct 24, 2024

View reviewed changes

steffenlarsen merged commit cbdee7a into intel:sycl Oct 24, 2024
13 checks passed

wenju-he deleted the SpecConstantsPass-cl-opt-SpecConstantMode branch October 24, 2024 06:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NFC][SYCL][SYCLLowerIR] Add cl::opt SpecConstantMode for LIT testing #15821

[NFC][SYCL][SYCLLowerIR] Add cl::opt SpecConstantMode for LIT testing #15821

wenju-he commented Oct 23, 2024

wenju-he commented Oct 23, 2024

asudarsa Oct 23, 2024

wenju-he Oct 24, 2024

asudarsa Oct 23, 2024

wenju-he Oct 24, 2024

asudarsa Oct 23, 2024

wenju-he Oct 24, 2024

asudarsa Oct 23, 2024

wenju-he Oct 24, 2024

asudarsa Oct 23, 2024

wenju-he Oct 24, 2024

asudarsa Oct 23, 2024

wenju-he Oct 24, 2024

asudarsa left a comment

asudarsa left a comment

wenju-he commented Oct 24, 2024

	cl::desc("Spec constant handling mode"),
	cl::desc("Specialization constant handling mode"),

	"spec constant uses are replaced by default values"),
	"Specialization constant uses are replaced by default values"),

	"spec constant intrinsics are replaced by RT buffers"),
	"Specialization constant intrinsics are replaced by run-time buffers"),

	"spec constant intrinsics are lowered to spirv intrinsics")));
	"Specialization constant intrinsics are lowered to SPIR-V intrinsics")));

		@@ -1,7 +1,6 @@
		; RUN: sycl-post-link -properties -split=auto -spec-const=native -S -o %t.table %s -generate-device-image-default-spec-consts

		@@ -29,6 +29,19 @@

		using namespace llvm;

		static cl::opt<SpecConstantsPass::HandlingMode> SpecConstantMode(

[NFC][SYCL][SYCLLowerIR] Add cl::opt SpecConstantMode for LIT testing #15821

[NFC][SYCL][SYCLLowerIR] Add cl::opt SpecConstantMode for LIT testing #15821

Conversation

wenju-he commented Oct 23, 2024

wenju-he commented Oct 23, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

asudarsa left a comment

Choose a reason for hiding this comment

asudarsa left a comment

Choose a reason for hiding this comment

wenju-he commented Oct 24, 2024