rusticl: use cleanup funcs

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24687>

diff --git a/src/gallium/frontends/rusticl/core/kernel.rs b/src/gallium/frontends/rusticl/core/kernel.rs
index af980ab..b951ddc 100644 (file)
--- a/src/gallium/frontends/rusticl/core/kernel.rs
+++ b/src/gallium/frontends/rusticl/core/kernel.rs
@@ -441,7 +441,7 @@ fn lower_and_optimize_nir(
         progress
     } {}
     nir.inline(lib_clc);
-    nir.remove_non_entrypoints();
+    nir.cleanup_functions();
     // that should free up tons of memory
     nir.sweep_mem();
 

diff --git a/src/gallium/frontends/rusticl/mesa/compiler/nir.rs b/src/gallium/frontends/rusticl/mesa/compiler/nir.rs
index 8ae04d3..a3e00e5 100644 (file)
--- a/src/gallium/frontends/rusticl/mesa/compiler/nir.rs
+++ b/src/gallium/frontends/rusticl/mesa/compiler/nir.rs
@@ -279,6 +279,10 @@ impl NirShader {
         unsafe { nir_remove_non_entrypoints(self.nir.as_ptr()) };
     }
 
+    pub fn cleanup_functions(&mut self) {
+        unsafe { nir_cleanup_functions(self.nir.as_ptr()) };
+    }
+
     pub fn variables(&mut self) -> ExecListIter<nir_variable> {
         ExecListIter::new(
             &mut unsafe { self.nir.as_mut() }.variables,