Skip to content

add targets vulkan1.3, vulkan1.4 and spv1.6 #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

add targets vulkan1.3, vulkan1.4 and spv1.6 #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2db9e4
WIP update spirv-tools
Firestar99 Jun 10, 2025
35f28ed
add vulkan1.3, vulkan1.4 and spv1.6 targets
Firestar99 Jun 6, 2025
fab1f2f
compiletest: extend vulkan ignores to include 1.3 and 1.4
Firestar99 Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:
- name: cargo fetch --locked
run: cargo fetch --locked --target ${{ matrix.target }}
- name: compiletest
run: cargo run -p compiletests --release --no-default-features --features "use-installed-tools" -- --target-env vulkan1.1,vulkan1.2,spv1.3
run: cargo run -p compiletests --release --no-default-features --features "use-installed-tools" -- --target-env vulkan1.1,vulkan1.2,vulkan1.3,vulkan1.4

difftest:
name: Difftest
Expand Down
6 changes: 2 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spirv-builder = { path = "./crates/spirv-builder", version = "=0.9.0", default-f
spirv-std = { path = "./crates/spirv-std", version = "=0.9.0" }
spirv-std-types = { path = "./crates/spirv-std/shared", version = "=0.9.0" }
spirv-std-macros = { path = "./crates/spirv-std/macros", version = "=0.9.0" }
spirv-tools = { version = "0.11", default-features = false }
spirv-tools = { git = "https://github.com/Rust-GPU/spirv-tools-rs", rev = "7b32f1fd8fa02ddab87550c5374effe11198bcab", default-features = false }
rustc_codegen_spirv = { path = "./crates/rustc_codegen_spirv", version = "=0.9.0", default-features = false }
rustc_codegen_spirv-types = { path = "./crates/rustc_codegen_spirv-types", version = "=0.9.0" }
rustc_codegen_spirv-target-specs = { path = "crates/rustc_codegen_spirv-target-specs", version = "=0.9.0" }
Expand Down
12 changes: 12 additions & 0 deletions crates/rustc_codegen_spirv-target-specs/src/include_str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ pub const TARGET_SPECS: &[(&str, &str)] = &[
"spirv-unknown-spv1.5.json",
include_str!("../target-specs/spirv-unknown-spv1.5.json"),
),
(
"spirv-unknown-spv1.6.json",
include_str!("../target-specs/spirv-unknown-spv1.6.json"),
),
(
"spirv-unknown-vulkan1.0.json",
include_str!("../target-specs/spirv-unknown-vulkan1.0.json"),
Expand All @@ -60,4 +64,12 @@ pub const TARGET_SPECS: &[(&str, &str)] = &[
"spirv-unknown-vulkan1.2.json",
include_str!("../target-specs/spirv-unknown-vulkan1.2.json"),
),
(
"spirv-unknown-vulkan1.3.json",
include_str!("../target-specs/spirv-unknown-vulkan1.3.json"),
),
(
"spirv-unknown-vulkan1.4.json",
include_str!("../target-specs/spirv-unknown-vulkan1.4.json"),
),
];
26 changes: 26 additions & 0 deletions crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": "spv1.6",
"linker-flavor": "unix",
"linker-is-gnu": false,
"llvm-target": "spirv-unknown-spv1.6",
"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"
}
26 changes: 26 additions & 0 deletions crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": "vulkan1.3",
"linker-flavor": "unix",
"linker-is-gnu": false,
"llvm-target": "spirv-unknown-vulkan1.3",
"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"
}
26 changes: 26 additions & 0 deletions crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": "vulkan1.4",
"linker-flavor": "unix",
"linker-is-gnu": false,
"llvm-target": "spirv-unknown-vulkan1.4",
"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"
}
38 changes: 6 additions & 32 deletions crates/rustc_codegen_spirv/src/target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ impl SpirvTarget {
| TargetEnv::Universal_1_2
| TargetEnv::Universal_1_3
| TargetEnv::Universal_1_4
| TargetEnv::Universal_1_5 => MemoryModel::Simple,
| TargetEnv::Universal_1_5
| TargetEnv::Universal_1_6 => MemoryModel::Simple,

TargetEnv::OpenGL_4_0
| TargetEnv::OpenGL_4_1
Expand All @@ -38,41 +39,14 @@ impl SpirvTarget {
| TargetEnv::Vulkan_1_1
| TargetEnv::WebGPU_0
| TargetEnv::Vulkan_1_1_Spirv_1_4
| TargetEnv::Vulkan_1_2 => MemoryModel::Vulkan,
| TargetEnv::Vulkan_1_2
| TargetEnv::Vulkan_1_3
| TargetEnv::Vulkan_1_4 => MemoryModel::Vulkan,
}
}

pub fn spirv_version(&self) -> (u8, u8) {
#[allow(clippy::match_same_arms)]
match self.env {
TargetEnv::Universal_1_0 => (1, 0),
TargetEnv::Universal_1_1 => (1, 1),
TargetEnv::Universal_1_2 => (1, 2),
TargetEnv::Universal_1_3 => (1, 3),
TargetEnv::Universal_1_4 => (1, 4),
TargetEnv::Universal_1_5 => (1, 5),

TargetEnv::OpenGL_4_0 => (1, 0),
TargetEnv::OpenGL_4_1 => (1, 0),
TargetEnv::OpenGL_4_2 => (1, 0),
TargetEnv::OpenGL_4_3 => (1, 0),
TargetEnv::OpenGL_4_5 => (1, 0),

TargetEnv::OpenCL_1_2 => (1, 0),
TargetEnv::OpenCL_2_0 => (1, 0),
TargetEnv::OpenCL_2_1 => (1, 0),
TargetEnv::OpenCL_2_2 => (1, 2),
TargetEnv::OpenCLEmbedded_1_2 => (1, 0),
TargetEnv::OpenCLEmbedded_2_0 => (1, 0),
TargetEnv::OpenCLEmbedded_2_1 => (1, 0),
TargetEnv::OpenCLEmbedded_2_2 => (1, 2),

TargetEnv::Vulkan_1_0 => (1, 0),
TargetEnv::Vulkan_1_1 => (1, 3),
TargetEnv::WebGPU_0 => (1, 3),
TargetEnv::Vulkan_1_1_Spirv_1_4 => (1, 4),
TargetEnv::Vulkan_1_2 => (1, 5),
}
self.env.spirv_version()
}

fn init_target_opts(&self) -> TargetOptions {
Expand Down
5 changes: 3 additions & 2 deletions crates/spirv-builder/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,9 +782,10 @@ fn invoke_rustc(builder: &SpirvBuilder) -> Result<PathBuf, SpirvBuilderError> {
//
// FIXME(eddyb) consider moving this list, or even `target-specs`,
// into `rustc_codegen_spirv_types`'s code/source.
"spv1.0" | "spv1.1" | "spv1.2" | "spv1.3" | "spv1.4" | "spv1.5" => {}
"spv1.0" | "spv1.1" | "spv1.2" | "spv1.3" | "spv1.4" | "spv1.5" | "spv1.6" => {}
"opengl4.0" | "opengl4.1" | "opengl4.2" | "opengl4.3" | "opengl4.5" => {}
"vulkan1.0" | "vulkan1.1" | "vulkan1.1spv1.4" | "vulkan1.2" => {}
"vulkan1.0" | "vulkan1.1" | "vulkan1.1spv1.4" | "vulkan1.2" | "vulkan1.3"
| "vulkan1.4" => {}

_ => {
return Err(SpirvBuilderError::UnsupportedSpirvTargetEnv {
Expand Down
3 changes: 3 additions & 0 deletions docs/src/platform-support.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,16 @@ The `rust-gpu` project currently supports a limited number of platforms and grap
- `spirv-unknown-spv1.3`
- `spirv-unknown-spv1.4`
- `spirv-unknown-spv1.5`
- `spirv-unknown-spv1.6`

### Vulkan Targets

- `spirv-unknown-vulkan1.0`
- `spirv-unknown-vulkan1.1`
- `spirv-unknown-vulkan1.1spv1.4`
- `spirv-unknown-vulkan1.2`
- `spirv-unknown-vulkan1.3`
- `spirv-unknown-vulkan1.4`

### WebGPU Targets

Expand Down
2 changes: 2 additions & 0 deletions tests/compiletests/ui/dis/asm_op_decorate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// and the pre-`vulkan1.2` output, but per-revisions `{only,ignore}-*` directives
// are not supported in `compiletest-rs`.
// ignore-vulkan1.2
// ignore-vulkan1.3
// ignore-vulkan1.4

use core::arch::asm;
use spirv_std::spirv;
Expand Down
2 changes: 2 additions & 0 deletions tests/compiletests/ui/dis/non-writable-storage_buffer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
// and the pre-`vulkan1.2` output, but per-revisions `{only,ignore}-*` directives
// are not supported in `compiletest-rs`.
// ignore-vulkan1.2
// ignore-vulkan1.3
// ignore-vulkan1.4

use spirv_std::spirv;

Expand Down
4 changes: 3 additions & 1 deletion tests/compiletests/ui/image/gather.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ pub fn main(
target_env = "vulkan1.0",
target_env = "vulkan1.1",
target_env = "vulkan1.1spv1.4",
target_env = "vulkan1.2"
target_env = "vulkan1.2",
target_env = "vulkan1.3",
target_env = "vulkan1.4"
)))]
#[spirv(fragment)]
pub fn main_rect(
Expand Down
4 changes: 3 additions & 1 deletion tests/compiletests/ui/image/sample_depth_reference/sample_gradient.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ pub fn main(
target_env = "vulkan1.0",
target_env = "vulkan1.1",
target_env = "vulkan1.1spv1.4",
target_env = "vulkan1.2"
target_env = "vulkan1.2",
target_env = "vulkan1.3",
target_env = "vulkan1.4"
)))]
#[spirv(fragment)]
pub fn main_cubemap(
Expand Down
4 changes: 3 additions & 1 deletion tests/compiletests/ui/image/sample_depth_reference/sample_lod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ pub fn main(
target_env = "vulkan1.0",
target_env = "vulkan1.1",
target_env = "vulkan1.1spv1.4",
target_env = "vulkan1.2"
target_env = "vulkan1.2",
target_env = "vulkan1.3",
target_env = "vulkan1.4"
)))]
#[spirv(fragment)]
pub fn main_cubemap(
Expand Down