Commit 6696b4f

committed

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

1 parent b0e8c81 commit 6696b4fCopy full SHA for 6696b4f

File tree

+36

-0

lines changed

+36

-0

lines changed

Lines changed: 2 additions & 0 deletions

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,26 @@`
	`1`	`+{`
	`2`	`+ "allows-weak-linkage": false,`
	`3`	`+ "arch": "spirv",`
	`4`	`+ "crt-objects-fallback": "false",`
	`5`	`+ "crt-static-allows-dylibs": true,`
	`6`	`+ "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",`
	`7`	`+ "dll-prefix": "",`
	`8`	`+ "dll-suffix": ".spv.json",`
	`9`	`+ "dynamic-linking": true,`
	`10`	`+ "emit-debug-gdb-scripts": false,`
	`11`	`+ "env": "wgsl",`
	`12`	`+ "linker-flavor": "unix",`
	`13`	`+ "linker-is-gnu": false,`
	`14`	`+ "llvm-target": "spirv-unknown-wgsl",`
	`15`	`+ "main-needs-argc-argv": false,`
	`16`	`+ "metadata": {`
	`17`	`+ "description": null,`
	`18`	`+ "host_tools": null,`
	`19`	`+ "std": null,`
	`20`	`+ "tier": null`
	`21`	`+ },`
	`22`	`+ "os": "unknown",`
	`23`	`+ "panic-strategy": "abort",`
	`24`	`+ "simd-types-indirect": false,`
	`25`	`+ "target-pointer-width": "32"`
	`26`	`+}`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -297,6 +297,10 @@ fn post_link_single_module(`
`297`	`297`	`do_spirv_val(sess, &spv_binary, out_filename, val_options);`
`298`	`298`	`}`
`299`	`299`
	`300`	`+ if sess.target.options.env == "wgsl" {`
	`301`	`+ panic!("detected wgsl during linking!");`
	`302`	`+ }`
	`303`	`+`
`300`	`304`	`{`
`301`	`305`	`let save_modules_timer = sess.timer("link_save_modules");`
`302`	`306`	`if let Err(e) = std::fs::write(out_filename, spirv_tools::binary::from_binary(&spv_binary))`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ impl TargetsExt for SpirvTargetEnv {`
`32`	`32`	`\| SpirvTargetEnv::Vulkan_1_2`
`33`	`33`	`\| SpirvTargetEnv::Vulkan_1_3`
`34`	`34`	`\| SpirvTargetEnv::Vulkan_1_4 => MemoryModel::Vulkan,`
	`35`	`+`
	`36`	`+ SpirvTargetEnv::Wgsl => MemoryModel::Vulkan,`
`35`	`37`	`}`
`36`	`38`	`}`
`37`	`39`
`@@ -55,6 +57,8 @@ impl TargetsExt for SpirvTargetEnv {`
`55`	`57`	`SpirvTargetEnv::Vulkan_1_2 => spirv_tools::TargetEnv::Vulkan_1_2,`
`56`	`58`	`SpirvTargetEnv::Vulkan_1_3 => spirv_tools::TargetEnv::Vulkan_1_3,`
`57`	`59`	`SpirvTargetEnv::Vulkan_1_4 => spirv_tools::TargetEnv::Vulkan_1_4,`
	`60`	`+`
	`61`	`+ SpirvTargetEnv::Wgsl => spirv_tools::TargetEnv::Vulkan_1_2,`
`58`	`62`	`}`
`59`	`63`	`}`
`60`	`64`

Comments

(0)