Use assembler in tests

Author: Jake-Shadle

rustc_codegen_spirv/Cargo.toml

@@ -19,11 +19,16 @@ tar = "0.4"
 thiserror = "1.0.20"
 topological-sort = "0.1"
 
+[dependencies.spirv-tools]
+version = "0.1.0"
+path = "../spirv-tools"
+features = ["opt", "val"]
+
 [dev-dependencies]
 pretty_assertions = "0.6"
 tempfile = "3.1"
 
-[dependencies.spirv-tools]
+[dev-dependencies.spirv-tools]
 version = "0.1.0"
 path = "../spirv-tools"
-features = ["opt", "val"]
+features = ["as"]

rustc_codegen_spirv/src/linker/mod.rs

@@ -33,6 +33,16 @@ pub enum LinkerError {
         import_type: String,
         export_type: String,
     },
+    #[error("spirv-tools error {:#}", .0)]
+    #[cfg(test)]
+    SpirvTool(spirv_tools::Error),
+}
+
+#[cfg(test)]
+impl From<spirv_tools::Error> for LinkerError {
+    fn from(err: spirv_tools::Error) -> Self {
+        Self::SpirvTool(err)
+    }
 }
 
 pub type Result<T> = std::result::Result<T, LinkerError>;

rustc_codegen_spirv/src/linker/test.rs

@@ -12,54 +12,24 @@ impl<'a> std::fmt::Debug for PrettyString<'a> {
     }
 }
 
-fn assemble_spirv(spirv: &str) -> Vec<u8> {
-    use std::process::Command;
-    use tempfile::tempdir;
+fn assemble_spirv(spirv: &str) -> Result<Vec<u8>> {
+    use spirv_tools::assembler;
 
-    let temp = tempdir().expect("Unable to create temp dir");
-    let input = temp.path().join("code.txt");
-    let output = temp.path().join("code.spv");
+    let assembler = assembler::Assembler::new(spirv_tools::default_target_env());
 
-    std::fs::write(&input, spirv).unwrap();
+    let spv_binary = assembler.assemble(spirv, assembler::AssemblerOptions::default())?;
 
-    let process = Command::new("spirv-as")
-        .arg(input.to_str().unwrap())
-        .arg("-o")
-        .arg(output.to_str().unwrap())
-        .output()
-        .expect("failed to execute process");
-
-    println!("status: {}", process.status);
-    println!("stdout: {}", String::from_utf8_lossy(&process.stdout));
-    println!("stderr: {}", String::from_utf8_lossy(&process.stderr));
-
-    assert!(process.status.success());
-
-    std::fs::read(&output).unwrap()
+    let contents: &[u8] = spv_binary.as_ref();
+    Ok(contents.to_vec())
 }
 
 #[allow(unused)]
 fn validate(spirv: &[u32]) {
-    use std::process::Command;
-    use tempfile::tempdir;
-
-    let temp = tempdir().expect("Unable to create temp dir");
-    let input = temp.path().join("code.spv");
-
-    let spirv = unsafe { std::slice::from_raw_parts(spirv.as_ptr() as *const u8, spirv.len() * 4) };
-
-    std::fs::write(&input, spirv).unwrap();
-
-    let process = Command::new("spirv-val.exe")
-        .arg(input.to_str().unwrap())
-        .output()
-        .expect("failed to execute process");
+    let validator = spirv_tools::val::Validator::new(spirv_tools::default_target_env());
 
-    println!("status: {}", process.status);
-    println!("stdout: {}", String::from_utf8_lossy(&process.stdout));
-    println!("stderr: {}", String::from_utf8_lossy(&process.stderr));
-
-    assert!(process.status.success());
+    validator
+        .validate(spirv, &spirv_tools::val::ValidatorOptions::default())
+        .expect("validation error occurred");
 }
 
 fn load(bytes: &[u8]) -> Module {
@@ -126,7 +96,7 @@ fn standard() -> Result<()> {
         %2 = OpTypeFloat 32
         %1 = OpVariable %2 Uniform
         %3 = OpVariable %2 Input"#,
-    );
+    )?;
 
     let b = assemble_spirv(
         r#"OpCapability Linkage
@@ -135,7 +105,7 @@ fn standard() -> Result<()> {
         %3 = OpConstant %2 42
         %1 = OpVariable %2 Uniform %3
         "#,
-    );
+    )?;
 
     let result = assemble_and_link(&[&a, &b])?;
     let expect = r#"OpModuleProcessed "Linked by rspirv-linker"
@@ -155,7 +125,7 @@ fn not_a_lib_extra_exports() -> Result<()> {
             OpDecorate %1 LinkageAttributes "foo" Export
             %2 = OpTypeFloat 32
             %1 = OpVariable %2 Uniform"#,
-    );
+    )?;
 
     let result = assemble_and_link(&[&a])?;
     let expect = r#"OpModuleProcessed "Linked by rspirv-linker"
@@ -194,9 +164,9 @@ fn unresolved_symbol() -> Result<()> {
             OpDecorate %1 LinkageAttributes "foo" Import
             %2 = OpTypeFloat 32
             %1 = OpVariable %2 Uniform"#,
-    );
+    )?;
 
-    let b = assemble_spirv("OpCapability Linkage");
+    let b = assemble_spirv("OpCapability Linkage")?;
 
     let result = assemble_and_link(&[&a, &b]);
 
@@ -216,7 +186,7 @@ fn type_mismatch() -> Result<()> {
             %2 = OpTypeFloat 32
             %1 = OpVariable %2 Uniform
             %3 = OpVariable %2 Input"#,
-    );
+    )?;
 
     let b = assemble_spirv(
         r#"OpCapability Linkage
@@ -225,7 +195,7 @@ fn type_mismatch() -> Result<()> {
             %3 = OpConstant %2 42
             %1 = OpVariable %2 Uniform %3
         "#,
-    );
+    )?;
 
     let result = assemble_and_link(&[&a, &b]);
     assert_eq!(
@@ -247,7 +217,7 @@ fn multiple_definitions() -> Result<()> {
             %2 = OpTypeFloat 32
             %1 = OpVariable %2 Uniform
             %3 = OpVariable %2 Input"#,
-    );
+    )?;
 
     let b = assemble_spirv(
         r#"OpCapability Linkage
@@ -256,15 +226,15 @@ fn multiple_definitions() -> Result<()> {
             %2 = OpTypeFloat 32
             %3 = OpConstant %2 42
             %1 = OpVariable %2 Uniform %3"#,
-    );
+    )?;
 
     let c = assemble_spirv(
         r#"OpCapability Linkage
             OpDecorate %1 LinkageAttributes "foo" Export
             %2 = OpTypeFloat 32
             %3 = OpConstant %2 -1
             %1 = OpVariable %2 Uniform %3"#,
-    );
+    )?;
 
     let result = assemble_and_link(&[&a, &b, &c]);
     assert_eq!(
@@ -282,7 +252,7 @@ fn multiple_definitions_different_types() -> Result<()> {
             %2 = OpTypeFloat 32
             %1 = OpVariable %2 Uniform
             %3 = OpVariable %2 Input"#,
-    );
+    )?;
 
     let b = assemble_spirv(
         r#"OpCapability Linkage
@@ -291,15 +261,15 @@ fn multiple_definitions_different_types() -> Result<()> {
             %2 = OpTypeInt 32 0
             %3 = OpConstant %2 42
             %1 = OpVariable %2 Uniform %3"#,
-    );
+    )?;
 
     let c = assemble_spirv(
         r#"OpCapability Linkage
             OpDecorate %1 LinkageAttributes "foo" Export
             %2 = OpTypeFloat 32
             %3 = OpConstant %2 12
             %1 = OpVariable %2 Uniform %3"#,
-    );
+    )?;
 
     let result = assemble_and_link(&[&a, &b, &c]);
     assert_eq!(
@@ -348,7 +318,7 @@ fn func_ctrl() -> Result<()> {
             %5 = OpVariable %4 Uniform
             %1 = OpFunction %2 None %3
             OpFunctionEnd"#,
-    );
+    )?;
 
     let b = assemble_spirv(
         r#"OpCapability Linkage
@@ -359,7 +329,7 @@ fn func_ctrl() -> Result<()> {
             %4 = OpLabel
             OpReturn
             OpFunctionEnd"#,
-    );
+    )?;
 
     let result = assemble_and_link(&[&a, &b])?;
 
@@ -396,7 +366,7 @@ fn use_exported_func_param_attr() -> Result<()> {
             %4 = OpFunctionParameter %6
             OpFunctionEnd
             "#,
-    );
+    )?;
 
     let b = assemble_spirv(
         r#"OpCapability Kernel
@@ -412,7 +382,7 @@ fn use_exported_func_param_attr() -> Result<()> {
             OpReturn
             OpFunctionEnd
             "#,
-    );
+    )?;
 
     let result = assemble_and_link(&[&a, &b])?;
 
@@ -461,7 +431,7 @@ fn names_and_decorations() -> Result<()> {
             %4 = OpFunctionParameter %9
             OpFunctionEnd
             "#,
-    );
+    )?;
 
     let b = assemble_spirv(
         r#"OpCapability Kernel
@@ -480,7 +450,7 @@ fn names_and_decorations() -> Result<()> {
             OpReturn
             OpFunctionEnd
             "#,
-    );
+    )?;
 
     let result = assemble_and_link(&[&a, &b])?;