SPIR-V assembler and disassembler

.github/workflows/rust.yml

@@ -21,21 +21,49 @@ jobs:
     - uses: Swatinem/rust-cache@v2
       with:
         cache-on-failure: true
-    - name: Cargo build and test
-      id: cargo_build_and_test
+        workspaces: |
+          shader-reflect
+          spirq-as
+          spirq-core
+          spirq-dis
+          spirq-spvasm
+
+    - name: Cargo Format
+      id: cargo_format
       run: |
         cargo fmt -- --check
-        cargo build --release --verbose
+
+    - name: Cargo Build
+      id: cargo_build
+      run: |
+        cargo build --verbose
+
+    - name: Cargo Test
+      id: cargo_test
+      run: |
         cargo test --verbose
+
+    - name: Run SPIR-Q Examples
+      id: spirq_examples
+      run: |
         cargo run --example gallery > spirq/examples/gallery/main.log
         cargo run --example inspect > spirq/examples/inspect/main.log
         cargo run --example walk > spirq/examples/walk/main.log
-        cargo install --path shader-reflect
-        shader-reflect assets/gallery.frag -o assets/gallery.frag.json --reference-all-resources
-        shader-reflect assets/gallery.frag.spv -o assets/gallery.frag.spv.json --reference-all-resources
+
+    - name: Run shader-reflect
+      id: shader_reflect
+      run: |
+        cargo run -p shader-reflect assets/gallery.frag -o assets/gallery.frag.json --reference-all-resources
+        cargo run -p shader-reflect assets/gallery.frag.spv -o assets/gallery.frag.spv.json --reference-all-resources
         diff assets/gallery.frag.json assets/gallery.frag.spv.json
-        shader-reflect assets/spirv-spec.frag -o assets/spirv-spec.frag.json
-        shader-reflect assets/spirv-spec.frag.spv -o assets/spirv-spec.frag.spv.json
+        cargo run -p shader-reflect assets/spirv-spec.frag -o assets/spirv-spec.frag.json
+        cargo run -p shader-reflect assets/spirv-spec.frag.spv -o assets/spirv-spec.frag.spv.json
         diff assets/spirv-spec.frag.json assets/spirv-spec.frag.spv.json
-        shader-reflect assets/moon.spv -o assets/moon.spv.json --reference-all-resources
-        git diff --exit-code
+        cargo run -p shader-reflect assets/moon.spv -o assets/moon.spv.json --reference-all-resources
+
+    - name: Assemble Disassemble Roundtrip
+      id: cargo_build_and_test
+      run: |
+        cargo run -p spirq-as assets/gallery.frag.spvasm -o assets/gallery.frag.spv
+        cargo run -p spirq-dis assets/gallery.frag.spv -o assets/gallery.frag.spvasm --no-indent
+        echo git diff --exit-code --binary

Cargo.toml

@@ -2,5 +2,8 @@
 members = [
     "spirq",
     "spirq-core",
+    "spirq-spvasm",
+    "spirq-dis",
+    "spirq-as",
     "shader-reflect",
 ]

assets/gallery.frag

@@ -1,6 +1,13 @@
 #version 460 core
 #extension GL_EXT_ray_tracing : enable
 #extension GL_EXT_ray_query : enable
+#extension GL_EXT_shader_explicit_arithmetic_types_int8 : require
+#extension GL_EXT_shader_explicit_arithmetic_types_int16 : require
+#extension GL_EXT_shader_explicit_arithmetic_types_int32 : require
+#extension GL_EXT_shader_explicit_arithmetic_types_int64 : require
+#extension GL_EXT_shader_explicit_arithmetic_types_float16 : require
+#extension GL_EXT_shader_explicit_arithmetic_types_float32 : require
+#extension GL_EXT_shader_explicit_arithmetic_types_float64 : require
 
 struct Data {
     // Signed integer scalar and vector types.
@@ -181,7 +188,7 @@ layout(set=12, binding=0) uniform Ubo {
 
 // Storage buffer block with dynamic size.
 layout(set=13, binding=0) buffer Ssbo {
-    Data ds[];
+    int ds[];
 } ssbo;
 
 layout(set=14, binding=0, input_attachment_index=0) uniform isubpassInput   iAttm;
@@ -194,6 +201,23 @@ layout(set=14, binding=5, input_attachment_index=5) uniform subpassInputMS  fAtt
 // Acceleration structure (for ray-tracing).
 layout(set=15, binding=0) uniform accelerationStructureEXT acc;
 
+const int8_t INT8 = int8_t(1);
+const int16_t INT16 = int16_t(1);
+const int32_t INT32 = int32_t(1);
+const int64_t INT64 = int64_t(1);
+
+const uint8_t UINT8 = uint8_t(1);
+const uint16_t UINT16 = uint16_t(1);
+const uint32_t UINT32 = uint32_t(1);
+const uint64_t UINT64 = uint64_t(1);
+
+// (penguinliong) Don't know why but SPIR-V Tools disassemble fp16 values to
+// mantissa and exponent bias which is pretty much a special case I don't wanna
+// work with atm.
+const float16_t FLOAT16 = float16_t(0.25);
+const float32_t FLOAT32 = float32_t(1.0);
+const float64_t FLOAT64 = float64_t(1.0);
+
 void main() {
     rayQueryEXT ray_query;
     rayQueryProceedEXT(ray_query);