optimize Rust file creation

Author: folkertdev

crates/intrinsic-test/src/arm/mod.rs

@@ -57,11 +57,9 @@ impl SupportedArchitectureTest for ArmArchitectureTest {
         let c_target = "aarch64";
 
         let intrinsics_name_list = write_c_testfiles(
-            &self
-                .intrinsics
+            self.intrinsics
                 .iter()
-                .map(|i| i as &dyn IntrinsicDefinition<_>)
-                .collect::<Vec<_>>(),
+                .map(|i| i as &dyn IntrinsicDefinition<_>),
             target,
             c_target,
             &["arm_neon.h", "arm_acle.h", "arm_fp16.h"],
@@ -92,15 +90,14 @@ impl SupportedArchitectureTest for ArmArchitectureTest {
         let intrinsics_name_list = write_rust_testfiles(
             self.intrinsics
                 .iter()
-                .map(|i| i as &dyn IntrinsicDefinition<_>)
-                .collect::<Vec<_>>(),
+                .map(|i| i as &dyn IntrinsicDefinition<_>),
             rust_target,
             &build_notices("// "),
             F16_FORMATTING_DEF,
             AARCH_CONFIGURATIONS,
         );
 
-        compile_rust_programs(intrinsics_name_list, toolchain, target, linker)
+        compile_rust_programs(intrinsics_name_list.unwrap(), toolchain, target, linker)
     }
 
     fn compare_outputs(&self) -> bool {

crates/intrinsic-test/src/common/gen_rust.rs

@@ -1,6 +1,4 @@
 use itertools::Itertools;
-use rayon::prelude::*;
-use std::collections::BTreeMap;
 use std::fs::File;
 use std::process::Command;
 
@@ -124,20 +122,6 @@ pub fn compile_rust_programs(
     }
 }
 
-// Creates directory structure and file path mappings
-pub fn setup_rust_file_paths(identifiers: &Vec<String>) -> BTreeMap<&String, String> {
-    identifiers
-        .par_iter()
-        .map(|identifier| {
-            let rust_dir = format!("rust_programs/{identifier}");
-            let _ = std::fs::create_dir_all(&rust_dir);
-            let rust_filename = format!("{rust_dir}/main.rs");
-
-            (identifier, rust_filename)
-        })
-        .collect::<BTreeMap<&String, String>>()
-}
-
 pub fn generate_rust_test_loop<T: IntrinsicTypeDefinition>(
     intrinsic: &dyn IntrinsicDefinition<T>,
     indentation: Indentation,

crates/intrinsic-test/src/common/write_file.rs

@@ -1,34 +1,32 @@
 use std::fs::File;
 use std::io::Write;
 
-use super::gen_rust::{create_rust_test_program, setup_rust_file_paths};
+use super::gen_rust::create_rust_test_program;
 use super::intrinsic::IntrinsicDefinition;
 use super::intrinsic_helpers::IntrinsicTypeDefinition;
 
-pub fn write_file(filename: &String, code: String) {
-    let mut file = File::create(filename).unwrap();
-    file.write_all(code.into_bytes().as_slice()).unwrap();
-}
-
-pub fn write_c_testfiles<T: IntrinsicTypeDefinition + Sized>(
-    intrinsics: &[&dyn IntrinsicDefinition<T>],
+pub fn write_c_testfiles<'a, T, I>(
+    intrinsics: I,
     target: &str,
     c_target: &str,
     headers: &[&str],
     notice: &str,
     arch_specific_definitions: &[&str],
-) -> std::io::Result<Vec<String>> {
+) -> std::io::Result<Vec<String>>
+where
+    T: IntrinsicTypeDefinition + Sized + 'a,
+    I: Iterator<Item = &'a dyn IntrinsicDefinition<T>>,
+{
     std::fs::create_dir_all("c_programs")?;
 
     intrinsics
-        .iter()
         .map(|intrinsic| {
             let identifier = intrinsic.name().to_owned();
             let mut file = File::create(format!("c_programs/{identifier}.cpp")).unwrap();
 
             // write_c_test_program(&mut file, intrinsic)?;
             let c_code = crate::common::gen_c::create_c_test_program(
-                *intrinsic,
+                intrinsic,
                 headers,
                 target,
                 c_target,
@@ -43,25 +41,34 @@ pub fn write_c_testfiles<T: IntrinsicTypeDefinition + Sized>(
         .collect()
 }
 
-pub fn write_rust_testfiles<T: IntrinsicTypeDefinition>(
-    intrinsics: Vec<&dyn IntrinsicDefinition<T>>,
+pub fn write_rust_testfiles<'a, T, I>(
+    intrinsics: I,
     rust_target: &str,
     notice: &str,
     definitions: &str,
     cfg: &str,
-) -> Vec<String> {
-    let intrinsics_name_list = intrinsics
-        .iter()
-        .map(|i| i.name().clone())
-        .collect::<Vec<_>>();
-    let filename_mapping = setup_rust_file_paths(&intrinsics_name_list);
+) -> std::io::Result<Vec<String>>
+where
+    T: IntrinsicTypeDefinition + Sized + 'a,
+    I: Iterator<Item = &'a dyn IntrinsicDefinition<T>>,
+{
+    std::fs::create_dir_all("rust_programs")?;
+
+    intrinsics
+        .map(|intrinsic| {
+            let identifier = intrinsic.name().to_owned();
 
-    intrinsics.iter().for_each(|&i| {
-        let rust_code = create_rust_test_program(i, rust_target, notice, definitions, cfg);
-        if let Some(filename) = filename_mapping.get(&i.name()) {
-            write_file(filename, rust_code)
-        }
-    });
+            let rust_dir = format!("rust_programs/{identifier}");
+            std::fs::create_dir_all(&rust_dir)?;
+            let rust_filename = format!("{rust_dir}/main.rs");
+            let mut file = File::create(rust_filename).unwrap();
 
-    intrinsics_name_list
+            let rust_code =
+                create_rust_test_program(intrinsic, rust_target, notice, definitions, cfg);
+
+            file.write_all(rust_code.as_bytes())?;
+
+            Ok(identifier)
+        })
+        .collect()
 }