add spirv-unknown-wgsl target, forcefully panic during linking

Author: Firestar99

crates/rustc_codegen_spirv-target-specs/src/include_str.rs

@@ -59,6 +59,9 @@ impl SpirvTargetEnv {
             SpirvTargetEnv::Vulkan_1_4 => {
                 include_str!("../target-specs/spirv-unknown-vulkan1.4.json")
             }
+            SpirvTargetEnv::Wgsl => {
+                include_str!("../target-specs/spirv-unknown-wgsl.json")
+            }
         }
     }
 }

crates/rustc_codegen_spirv-target-specs/src/lib.rs

@@ -52,6 +52,8 @@ pub enum SpirvTargetEnv {
     Vulkan_1_3,
     #[strum(to_string = "vulkan1.4")]
     Vulkan_1_4,
+    #[strum(to_string = "wgsl")]
+    Wgsl,
 }
 
 impl SpirvTargetEnv {
@@ -93,7 +95,7 @@ mod tests {
     #[test]
     pub fn test_parse_as_str_loop() {
         for target in SpirvTargetEnv::iter() {
-            let parsed = SpirvTargetEnv::parse_triple(target.as_str()).unwrap();
+            let parsed = SpirvTargetEnv::parse_triple(&target.target_triple()).unwrap();
             assert_eq!(target, parsed);
         }
     }

crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-wgsl.json

@@ -0,0 +1,26 @@
+{
+  "allows-weak-linkage": false,
+  "arch": "spirv",
+  "crt-objects-fallback": "false",
+  "crt-static-allows-dylibs": true,
+  "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
+  "dll-prefix": "",
+  "dll-suffix": ".spv.json",
+  "dynamic-linking": true,
+  "emit-debug-gdb-scripts": false,
+  "env": "wgsl",
+  "linker-flavor": "unix",
+  "linker-is-gnu": false,
+  "llvm-target": "spirv-unknown-wgsl",
+  "main-needs-argc-argv": false,
+  "metadata": {
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
+  },
+  "os": "unknown",
+  "panic-strategy": "abort",
+  "simd-types-indirect": false,
+  "target-pointer-width": "32"
+}

crates/rustc_codegen_spirv/src/link.rs

@@ -297,6 +297,10 @@ fn post_link_single_module(
         do_spirv_val(sess, &spv_binary, out_filename, val_options);
     }
 
+    if sess.target.options.env == "wgsl" {
+        panic!("detected wgsl during linking!");
+    }
+
     {
         let save_modules_timer = sess.timer("link_save_modules");
         if let Err(e) = std::fs::write(out_filename, spirv_tools::binary::from_binary(&spv_binary))

crates/rustc_codegen_spirv/src/target.rs

@@ -33,6 +33,8 @@ impl TargetsExt for SpirvTargetEnv {
             | SpirvTargetEnv::Vulkan_1_2
             | SpirvTargetEnv::Vulkan_1_3
             | SpirvTargetEnv::Vulkan_1_4 => MemoryModel::Vulkan,
+
+            SpirvTargetEnv::Wgsl => MemoryModel::Vulkan,
         }
     }
 
@@ -57,6 +59,8 @@ impl TargetsExt for SpirvTargetEnv {
             SpirvTargetEnv::Vulkan_1_2 => spirv_tools::TargetEnv::Vulkan_1_2,
             SpirvTargetEnv::Vulkan_1_3 => spirv_tools::TargetEnv::Vulkan_1_3,
             SpirvTargetEnv::Vulkan_1_4 => spirv_tools::TargetEnv::Vulkan_1_4,
+
+            SpirvTargetEnv::Wgsl => spirv_tools::TargetEnv::Vulkan_1_2,
         }
     }