From f467a895236bdd67f0eed4cfbcbc2b436e94325d Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sun, 9 Jun 2024 20:22:56 -0700 Subject: [PATCH] rusticl: add -cl-std only when it's not defined This fixes piglit "Invalid CL Version Declaration" test. Fixes: fc30fe2c110f ("rusticl/kernel: add missing preprocessor definitions") Reviewed-by: Karol Herbst Signed-off-by: David Heidelberg Part-of: --- src/gallium/drivers/llvmpipe/ci/llvmpipe-rusticl-fails.txt | 5 ----- src/gallium/frontends/rusticl/core/program.rs | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-rusticl-fails.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-rusticl-fails.txt index cdfb41d1eb5..4a0bb56e2b1 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-rusticl-fails.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-rusticl-fails.txt @@ -26,11 +26,6 @@ api@clgetkernelarginfo,Fail # Failed (error code: CL_SUCCESS): Trigger CL_LINK_PROGRAM_FAILURE if there is a failure to link the compiled binaries and/or libraries. api@cllinkprogram,Fail -# input.cl:31:2: error: use of undeclared identifier 'double2'; did you mean 'double'? -# [...] -# Program built when it should have failed: CL_SUCCESS -program@build@fail@invalid-version-declaration,Fail - # "input.cl:8:10: fatal error: 'include_test.h' file not found" # build-piglit.sh removes all the *.[ch] files from the piglit tree, so it's a Mesa CI bug. program@build@include-directories,Fail diff --git a/src/gallium/frontends/rusticl/core/program.rs b/src/gallium/frontends/rusticl/core/program.rs index 75fc1121445..81b13dc6f12 100644 --- a/src/gallium/frontends/rusticl/core/program.rs +++ b/src/gallium/frontends/rusticl/core/program.rs @@ -298,7 +298,7 @@ pub struct ProgramDevBuild { fn prepare_options(options: &str, dev: &Device) -> Vec { let mut options = options.to_owned(); - if !options.contains("-cl-std=CL") { + if !options.contains("-cl-std=") { options.push_str(" -cl-std=CL"); options.push_str(dev.clc_version.api_str()); }