rusticl/kernel: Fix creation from programs not built for every device
authorKarol Herbst <kherbst@redhat.com>
Thu, 12 Oct 2023 22:06:51 +0000 (00:06 +0200)
committerMarge Bot <emma+marge@anholt.net>
Fri, 13 Oct 2023 08:51:30 +0000 (08:51 +0000)
OpenCL does not require that a kernel is created for every device. So we
shouldn't assume there is a build for every device.

API validation around launching kernels already takes this possibility
into account.

I did not verify if the commit below is actually the culprit and whether
this bug existed before that, but a fix for older code also would have to
look differently anyway.

Fixes: 323dcbb4b52 ("rusticl: Move NirKernelBuild to ProgramDevBuild")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9968
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25696>

src/gallium/frontends/rusticl/core/kernel.rs

index 539dfbc..8ef491e 100644 (file)
@@ -788,7 +788,7 @@ impl Kernel {
         let builds = prog_build
             .builds
             .iter()
-            .map(|(k, v)| (*k, v.kernels.get(&name).unwrap().clone()))
+            .filter_map(|(&dev, b)| b.kernels.get(&name).map(|k| (dev, k.clone())))
             .collect();
 
         // can't use vec!...