From f4f6d2e7cf102e89a7fedef7622fb79a8440d383 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Wed, 7 Jun 2023 23:14:18 +0200 Subject: [PATCH] clc: relax spec constant validation Multiple values can have multiple spec constants assigned and vtn handles this just fine. So just drop that assert as we need it to run SyCL kernels. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9037 Fixes: a699844ffba ("microsoft/clc: Parse SPIR-V specialization consts into metadata") Signed-off-by: Karol Herbst Acked-by: Jesse Natalie Part-of: (cherry picked from commit 90b8666ff2f73e691ff34ffa87962a0922950b7d) --- .pick_status.json | 2 +- src/compiler/clc/clc_helpers.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 481debd395f..e6e8f5aed24 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3271,7 +3271,7 @@ "description": "clc: relax spec constant validation", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a699844ffba20fb0bfe7103eb70938bac604748e" }, diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp index 7599141fb66..4634633307c 100644 --- a/src/compiler/clc/clc_helpers.cpp +++ b/src/compiler/clc/clc_helpers.cpp @@ -338,7 +338,6 @@ public: uint32_t spec_id = ins->words[ins->operands[2].offset]; for (auto &c : specConstants) { if (c.second.id == spec_id) { - assert(c.first == id); return; } }