diff --git a/default.nix b/default.nix index 7ca3aca..507ef59 100644 --- a/default.nix +++ b/default.nix @@ -45,7 +45,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { version = "nightly"; inherit src; - patches = [ ./cmake-fix.patch ]; + patches = [ ./cmake-fix.patch ./fix-cond-barrier-test.patch ]; cmakeFlags = [ # TODO: all these are broken when cross compiling. Upstream has refactored diff --git a/fix-cond-barrier-test.patch b/fix-cond-barrier-test.patch new file mode 100644 index 0000000..19e853f --- /dev/null +++ b/fix-cond-barrier-test.patch @@ -0,0 +1,49 @@ +Commit ID: 066a9b26b2f2d9036a762b859f59288687411ff5 +Change ID: vvstkqonluksmzmrwtwxqqrzlztylzyy +Author : Pekka Jääskeläinen (2025-12-08 14:10:29) +Committer: Aleix Boné (2026-02-23 16:18:20) + + Added missing validation file for conditional_barrier_dynamic + + It is still flaky across LLVM versions so disabling it for now + on CPU/loopvec. + +diff --git a/tests/workgroup/cond_barriers_dynamic_1_16_1_1_loopvec.stdout b/tests/workgroup/cond_barriers_dynamic_1_16_1_1_loopvec.stdout +new file mode 100644 +index 0000000000..ee2a07fa2d +--- /dev/null ++++ b/tests/workgroup/cond_barriers_dynamic_1_16_1_1_loopvec.stdout +@@ -0,0 +1,33 @@ ++LOCAL_ID=0 before if ++LOCAL_ID=1 before if ++LOCAL_ID=2 before if ++LOCAL_ID=3 before if ++LOCAL_ID=4 before if ++LOCAL_ID=5 before if ++LOCAL_ID=6 before if ++LOCAL_ID=7 before if ++LOCAL_ID=8 before if ++LOCAL_ID=9 before if ++LOCAL_ID=10 before if ++LOCAL_ID=11 before if ++LOCAL_ID=12 before if ++LOCAL_ID=13 before if ++LOCAL_ID=14 before if ++LOCAL_ID=15 before if ++LOCAL_ID=0 inside if ++LOCAL_ID=1 inside if ++LOCAL_ID=2 inside if ++LOCAL_ID=3 inside if ++LOCAL_ID=4 inside if ++LOCAL_ID=5 inside if ++LOCAL_ID=6 inside if ++LOCAL_ID=7 inside if ++LOCAL_ID=8 inside if ++LOCAL_ID=9 inside if ++LOCAL_ID=10 inside if ++LOCAL_ID=11 inside if ++LOCAL_ID=12 inside if ++LOCAL_ID=13 inside if ++LOCAL_ID=14 inside if ++LOCAL_ID=15 inside if ++OK