Merge branch 'main' into bughunt-loop-shortcut-0.4.0

Author: niklasha

.github/workflows/ci.yml

@@ -18,10 +18,8 @@ jobs:
           submodules: true
       - uses: actions-rs/toolchain@v1
         with:
-          # FIXME(eddyb) `style_edition = "2024"` in `rustfmt.toml` is what keeps
-          # this on `nightly`, should switch to `stable` when that stabilizes.
-          toolchain: nightly
-          # HACK(eddyb) use `nightly` by default without breaking the ability to
+          toolchain: stable
+          # HACK(eddyb) use `stable` by default without breaking the ability to
           # temporarily bypass it through `rust-toolchain.toml`.
           default: true
           override: false
@@ -63,7 +61,7 @@ jobs:
           override: true
       # NOTE(eddyb) this is the simplest way found so far to get `glslang`.
       - name: Prepare Vulkan SDK
-        uses: humbletim/setup-vulkan-sdk@v1.2.0
+        uses: humbletim/setup-vulkan-sdk@v1.2.1
         with:
           vulkan-query-version: 1.3.250.0
           vulkan-components: Glslang SPIRV-Tools

.github/workflows/rustdoc-pages.yml

@@ -40,7 +40,7 @@ jobs:
       id: pages
       uses: actions/configure-pages@v2
     - name: Upload artifact
-      uses: actions/upload-pages-artifact@v1
+      uses: actions/upload-pages-artifact@v3
       with:
         # Upload entire doc folder
         path: './target/doc'
@@ -66,4 +66,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4

Cargo.lock

@@ -1,11 +1,11 @@
 [package]
 name = "spirt"
 description = "Shader-focused IR to target, transform and translate from."
-repository = "https://github.com/rust-gpu/spirt/tree/0.4.0"
+repository = "https://github.com/rust-gpu/spirt"
 homepage = "https://github.com/rust-gpu/spirt"
 version = "0.4.0"
 authors = ["SPIR-T developers", "Embark <opensource@embark-studios.com>"]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 # FIXME(eddyb) should this point to the version built from `git`?

Cargo.toml

@@ -63,7 +63,7 @@ With the initial focus being on [Rust-GPU]'s usecase, various (otherwise desirab
 * "entity" system for e.g. definitions in a module, instructions in a function, etc.
   * disallows iteration in favor of/forcing the use of efficient indexing
 * structured control-flow "regions" inspired by RVSDG, stricter than SPIR-V
-  (see `ControlRegionDef`'s docs for more details)
+  (see `RegionDef`'s docs for more details)
 
 </td><td>
 

README.md

@@ -7,7 +7,7 @@ fn main() {
         std::env::current_dir().unwrap().join("khronos-spec/SPIRV-Headers/include/spirv/unified1");
     println!("cargo:rerun-if-changed={}", khr_spv_include_dir.display());
 
-    if !std::fs::metadata(&khr_spv_include_dir).map_or(false, |m| m.is_dir()) {
+    if !std::fs::metadata(&khr_spv_include_dir).is_ok_and(|m| m.is_dir()) {
         eprintln!(" error: {} is not a directory", khr_spv_include_dir.display());
         eprintln!("  help: git submodules are required to build from a git checkout");
         eprintln!("  help: run `git submodule update --init`");

build.rs

@@ -13,7 +13,7 @@
 //! be taken to preserve the correctness of such implicit dataflow across all
 //! transformations, and it's overall far more fragile than the local dataflow
 //! of e.g. phi nodes (or their alternative "block arguments"), or in SPIR-T's
-//! case, `ControlRegion` inputs and `ControlNode` outputs (inspired by RVSDG,
+//! case, `Region` inputs and `Node` outputs (inspired by RVSDG,
 //! which has even stricter isolation/locality in its regions).
 
 use crate::{FxIndexMap, FxIndexSet};
@@ -228,10 +228,13 @@ impl<'a, BlockId: Copy + Eq + Hash, DefId: Copy + Eq + Hash, DefType: Copy>
             .map(|block_id| BlockIdx(self.def_map.blocks_by_id.get_index_of(&block_id).unwrap()));
 
         if self.blocks[target_block_idx].preds.insert(source_block_idx) {
-            self.add_uses_to(source_block_idx, AddUsesSource::PropagateBackwardsAcrossEdge {
-                target: target_block_idx,
-                only_dirty: false,
-            });
+            self.add_uses_to(
+                source_block_idx,
+                AddUsesSource::PropagateBackwardsAcrossEdge {
+                    target: target_block_idx,
+                    only_dirty: false,
+                },
+            );
         }
     }
 
@@ -240,10 +243,13 @@ impl<'a, BlockId: Copy + Eq + Hash, DefId: Copy + Eq + Hash, DefType: Copy>
             for i in 0..self.blocks[block_idx].preds.len() {
                 let pred_block_idx = self.blocks[block_idx].preds[i];
 
-                self.add_uses_to(pred_block_idx, AddUsesSource::PropagateBackwardsAcrossEdge {
-                    target: block_idx,
-                    only_dirty: true,
-                });
+                self.add_uses_to(
+                    pred_block_idx,
+                    AddUsesSource::PropagateBackwardsAcrossEdge {
+                        target: block_idx,
+                        only_dirty: true,
+                    },
+                );
             }
             self.blocks[block_idx].dirty_chunks.clear();
         }
@@ -452,6 +458,8 @@ mod data {
 
     // HACK(eddyb) most of the need for this arises from avoidance of
     // `unsafe` code (i.e. `MaybeUninit<V>` could suffice in most cases).
+    // FIXME(eddyb) figure out if keeping this around is useful at all.
+    #[allow(unused)]
     pub enum WrapNonDefaultValueInOption {}
     impl<V> ValueStorage<V> for WrapNonDefaultValueInOption {
         type Slot = Option<V>;
@@ -556,7 +564,7 @@ mod data {
             self.contains(k).then(|| self.entry(k).remove().unwrap())
         }
 
-        pub fn keys(&self) -> impl Iterator<Item = K> {
+        pub fn keys(&self) -> impl Iterator<Item = K> + use<K, V, VS> {
             let mut i = 0;
             let mut remaining = self.occupied;
             iter::from_fn(move || {

src/cfg.rs

@@ -888,7 +888,6 @@ interners! {
         crate::AttrSetDef,
         crate::TypeDef,
         crate::ConstDef,
-        crate::DataInstFormDef,
     }
 
     // FIXME(eddyb) consider a more uniform naming scheme than the combination
@@ -897,7 +896,6 @@ interners! {
     AttrSet default(crate::AttrSetDef::default()) => crate::AttrSetDef,
     Type => crate::TypeDef,
     Const => crate::ConstDef,
-    DataInstForm => crate::DataInstFormDef,
 }
 
 impl<I: sealed::Interned> InternInCx<I> for I::Def
@@ -962,7 +960,7 @@ macro_rules! entities {
 entities! {
     GlobalVar => chunk_size(0x1_0000) crate::GlobalVarDecl,
     Func => chunk_size(0x1_0000) crate::FuncDecl,
-    ControlRegion => chunk_size(0x1000) crate::ControlRegionDef,
-    ControlNode => chunk_size(0x1000) EntityListNode<ControlNode, crate::ControlNodeDef>,
+    Region => chunk_size(0x1000) crate::RegionDef,
+    Node => chunk_size(0x1000) EntityListNode<Node, crate::NodeDef>,
     DataInst => chunk_size(0x1000) EntityListNode<DataInst, crate::DataInstDef>,
 }