target declaration refactor

Author: Firestar99

crates/rustc_codegen_spirv-types/src/target.rs

@@ -1,6 +1,7 @@
 use std::fmt::{Debug, Formatter};
 use thiserror::Error;
 
+pub const SPIRV_ARCH: &str = "spirv";
 pub const SPIRV_TARGET_PREFIX: &str = "spirv-unknown-";
 
 /// A well-formed rust-gpu target.

crates/rustc_codegen_spirv/src/builder_spirv.rs

@@ -5,7 +5,7 @@ use crate::builder;
 use crate::codegen_cx::CodegenCx;
 use crate::spirv_type::SpirvType;
 use crate::symbols::Symbols;
-use crate::target::SpirvTarget;
+use crate::target::{SpirvTarget, SpirvTargetVariant, SpirvVersion};
 use crate::target_feature::TargetFeature;
 use rspirv::dr::{Builder, Instruction, Module, Operand};
 use rspirv::spirv::{
@@ -491,7 +491,7 @@ impl<'tcx> BuilderSpirv<'tcx> {
 
         add_cap(&mut builder, &mut enabled_capabilities, Capability::Shader);
         if memory_model == MemoryModel::Vulkan {
-            if version < (1, 5) {
+            if version < SpirvVersion::V1_5 {
                 add_ext(&mut builder, sym.spv_khr_vulkan_memory_model);
             }
             add_cap(

crates/rustc_codegen_spirv/src/codegen_cx/mod.rs

@@ -10,11 +10,11 @@ use crate::builder_spirv::{
 use crate::custom_decorations::{CustomDecoration, SrcLocDecoration, ZombieDecoration};
 use crate::spirv_type::{SpirvType, SpirvTypePrinter, TypeCache};
 use crate::symbols::Symbols;
-use crate::target::SpirvTarget;
 
 // HACK(eddyb) avoids rewriting all of the imports (see `lib.rs` and `build.rs`).
 use crate::maybe_pqp_cg_ssa as rustc_codegen_ssa;
 
+use crate::target::SpirvTarget;
 use itertools::Itertools as _;
 use rspirv::dr::{Module, Operand};
 use rspirv::spirv::{Decoration, LinkageType, Word};
@@ -127,7 +127,7 @@ impl<'tcx> CodegenCx<'tcx> {
     pub fn new(tcx: TyCtxt<'tcx>, codegen_unit: &'tcx CodegenUnit<'tcx>) -> Self {
         // Validate the target spec, as the backend doesn't control `--target`.
         let target_tuple = tcx.sess.opts.target_triple.tuple();
-        let target: SpirvTarget = target_tuple.parse().unwrap_or_else(|_| {
+        let target = SpirvTarget::parse(target_tuple).unwrap_or_else(|_| {
             let qualifier = if !target_tuple.starts_with("spirv-") {
                 "non-SPIR-V "
             } else {

crates/rustc_codegen_spirv/src/lib.rs

@@ -130,7 +130,7 @@ mod linker;
 mod spirv_type;
 mod spirv_type_constraints;
 mod symbols;
-mod target;
+pub mod target;
 mod target_feature;
 
 use crate::maybe_pqp_cg_ssa::back::write::ThinLtoInput;

crates/rustc_codegen_spirv/src/linker/test.rs

@@ -1,4 +1,5 @@
 use super::{LinkResult, link};
+use crate::target::SpirvTarget;
 use rspirv::dr::Module;
 use rustc_session::CompilerIO;
 use rustc_session::config::{Input, OutputFilenames, OutputTypes};
@@ -113,10 +114,7 @@ fn link_with_linker_opts(
             };
         let sopts = rustc_session::config::build_session_options(&mut early_dcx, &matches);
 
-        let target = "spirv-unknown-spv1.0"
-            .parse::<crate::target::SpirvTarget>()
-            .unwrap()
-            .rustc_target();
+        let target = SpirvTarget::UNIVERSAL_1_0.rustc_target();
         let sm_inputs = rustc_span::source_map::SourceMapInputs {
             file_loader: Box::new(rustc_span::source_map::RealFileLoader),
             path_mapping: sopts.file_path_mapping(),