tool: move spirv_attr_version into a crate to allow publishing

Author: Firestar99

Cargo.lock

@@ -50,6 +50,7 @@ either = "1.8.0"
 indexmap = "2.6.0"
 rspirv = "0.12"
 rustc_codegen_spirv-types.workspace = true
+spirv-std-types = { workspace = true, features = ["std"] }
 rustc-demangle = "0.1.21"
 sanitize-filename = "0.6.0"
 smallvec = { version = "1.6.1", features = ["const_generics", "const_new", "union"] }

crates/rustc_codegen_spirv/Cargo.toml

@@ -133,8 +133,6 @@ mod custom_decorations;
 mod custom_insts;
 mod link;
 mod linker;
-#[path = "../../spirv_attr_version.rs"]
-mod spirv_attr_version;
 mod spirv_type;
 mod spirv_type_constraints;
 mod symbols;

crates/rustc_codegen_spirv/src/lib.rs

@@ -1,9 +1,9 @@
 use crate::attr::{IntrinsicType, SpirvAttribute};
 use crate::builder::libm_intrinsics;
-use crate::spirv_attr_version::spirv_attr_with_version;
 use rspirv::spirv::{BuiltIn, ExecutionMode, ExecutionModel, StorageClass};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_span::symbol::Symbol;
+use spirv_std_types::spirv_attr_version::spirv_attr_with_version;
 use std::rc::Rc;
 
 /// Various places in the codebase (mostly attribute parsing) need to compare rustc Symbols to particular keywords.

crates/rustc_codegen_spirv/src/symbols.rs

@@ -14,7 +14,7 @@ workspace = true
 proc-macro = true
 
 [dependencies]
-spirv-std-types.workspace = true
+spirv-std-types = { workspace = true, features = ["std"] }
 proc-macro2 = "1.0.24"
 quote = "1.0.8"
 syn = { version = "2.0.90", features = ["full", "visit-mut"] }

crates/spirv-std/macros/Cargo.toml

@@ -72,16 +72,14 @@
 #![doc = include_str!("../README.md")]
 
 mod image;
-#[path = "../../../spirv_attr_version.rs"]
-mod spirv_attr_version;
 
 use proc_macro::TokenStream;
 use proc_macro2::{Delimiter, Group, Span, TokenTree};
 
 use syn::{ImplItemFn, visit_mut::VisitMut};
 
-use crate::spirv_attr_version::spirv_attr_with_version;
 use quote::{ToTokens, TokenStreamExt, format_ident, quote};
+use spirv_std_types::spirv_attr_version::spirv_attr_with_version;
 use std::fmt::Write;
 
 /// A macro for creating SPIR-V `OpTypeImage` types. Always produces a

crates/spirv-std/macros/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "spirv-std-types"
-description = "SPIR-V types shared between spirv-std and spirv-std-macros"
+description = "SPIR-V types shared between spirv-std, spirv-std-macros and rustc_codegen_spirv"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
@@ -9,3 +9,6 @@ repository.workspace = true
 
 [lints]
 workspace = true
+
+[features]
+std = []

crates/spirv-std/shared/Cargo.toml

@@ -1,3 +1,5 @@
 # `spirv-std-types`
 
-Small shared crate, to share definitions between [`spirv-std`](https://docs.rs/spirv-std/) and [`spirv-std-macros`](https://docs.rs/spirv-std-macros/). Please refer to [`spirv-std`](https://docs.rs/spirv-std/) for more information.
+Small shared crate, to share definitions between [`spirv-std`](https://docs.rs/spirv-std/), [`spirv-std-macros`](https://docs.rs/spirv-std-macros/) and [`rustc_codegen_spirv`](https://docs.rs/rustc_codegen_spirv/). Should only contain symbols that compile in a `no_std` context.
+
+Please refer to [`spirv-std`](https://docs.rs/spirv-std/) for more information.

crates/spirv-std/shared/README.md

@@ -1,4 +1,6 @@
 #![doc = include_str!("../README.md")]
-#![no_std]
+#![cfg_attr(not(feature = "std"), no_std)]
 
 pub mod image_params;
+#[cfg(feature = "std")]
+pub mod spirv_attr_version;

crates/spirv-std/shared/src/lib.rs

@@ -0,0 +1,18 @@
+/// Returns the `spirv` attribute name with version tag.
+///
+/// The `#[spirv()]` attribute in `spirv_std` expands to this spirv attribute name,
+/// including the version of `spirv_std`. `rustc_codegen_spirv` verifies that the
+/// version matches with the codegen backend, to prevent accidental mismatches.
+///
+/// ```no_run
+/// # use spirv_std_types::spirv_attr_version::spirv_attr_with_version;
+/// let spirv = spirv_attr_with_version();
+/// let attr = format!("#[rust_gpu::{spirv}(vertex)]");
+/// // version here may be out-of-date
+/// assert_eq!("#[rust_gpu::spirv_v0_9(vertex)]", attr);
+/// ```
+pub fn spirv_attr_with_version() -> String {
+    let major: u32 = env!("CARGO_PKG_VERSION_MAJOR").parse().unwrap();
+    let minor: u32 = env!("CARGO_PKG_VERSION_MINOR").parse().unwrap();
+    format!("spirv_v{major}_{minor}")
+}