Add Rust to Bril

Cargo.toml

@@ -20,9 +20,11 @@ indexmap = "2.0"
 fixedbitset = "0.4.2"
 smallvec = "1.11.1"
 
-bril2json = { git = "https://github.com/sampsyo/bril", rev = "daaff28" }
-brilirs = { git = "https://github.com/sampsyo/bril", rev = "daaff28" }
-bril-rs = { git = "https://github.com/sampsyo/bril", rev = "daaff28" }
+syn = {version = "2.0", features = ["full", "extra-traits"]}
+bril2json = { git = "https://github.com/ajpal/bril", rev = "a27a351" }
+brilirs = { git = "https://github.com/ajpal/bril", rev = "a27a351" }
+bril-rs = { git = "https://github.com/ajpal/bril", rev = "a27a351" }
+rs2bril = { git = "https://github.com/ajpal/bril", rev = "a27a351", features = ["import"] }
 ordered-float = { version = "3.7" }
 serde_json = "1.0.103"
 

example.rs

@@ -0,0 +1,42 @@
+fn test(x: i64, f: f64, b: bool, ptr: [i64; 2], ptr2: &[[i64; 2]]) -> i64 {
+    let x: i64 = -1;
+    let y: bool = !(!true);
+    let z: f64 = -0.0;
+    z = -1.0;
+    f = 5.0;
+    f /= 2.0;
+    ptr[0] = 1;
+    ptr[1] = ptr[2 + x];
+
+    let foo : i64 = test2(1, 2);
+    test3();
+
+    let test: [i64;2] = [0, 1];
+    let test2: [[i64; 2]; 1] = [test];
+    let test3: [f64;10] = [z; 10];
+
+    if true {
+        let cond: i64 = 0;
+        while cond < 2 {
+            cond += 1;
+        }
+    } else {
+        if true {
+            let cond: bool = false;
+            while cond {}
+        }
+    }
+
+    println!("{}", x);
+
+    return x;
+}
+
+
+fn test2(x:i64, y:i64) -> i64 {
+    return x;
+}
+
+fn test3() {
+    return;
+}

infra/profile.sh

@@ -11,7 +11,7 @@ trap cleanup EXIT
 # TODO: take in file glob as command line argument
 PROFILES=(tests/*.bril tests/small/*.bril tests/brils/passing/**/*.bril)
 
-RUNMODES=("nothing" "rvsdg-round-trip" "optimize")
+RUNMODES=("parse" "rvsdg-round-trip" "optimize")
 
 # create temporary directory structure necessary for bench runs
 mkdir -p ./tmp/bench

src/main.rs

@@ -1,6 +1,6 @@
 use clap::Parser;
 use eggcc::util::{visualize, Run, RunType, TestProgram};
-use std::path::PathBuf;
+use std::{ffi::OsStr, path::PathBuf};
 
 #[derive(Debug, Parser)]
 struct Args {
@@ -31,7 +31,7 @@ fn main() {
     let args = Args::parse();
 
     if let Some(debug_dir) = args.debug_dir {
-        if let Result::Err(error) = visualize(TestProgram::File(args.file.clone()), debug_dir) {
+        if let Result::Err(error) = visualize(TestProgram::BrilFile(args.file.clone()), debug_dir) {
             eprintln!("{}", error);
             return;
         }
@@ -45,8 +45,15 @@ fn main() {
         return;
     }
 
+    let file = match args.file.extension().and_then(OsStr::to_str) {
+        Some("rs") => TestProgram::RustFile(args.file.clone()),
+        Some("bril") => TestProgram::BrilFile(args.file.clone()),
+        Some(x) => panic!("unexpected file extension {x}"),
+        None => panic!("could not parse file extension"),
+    };
+
     let run = Run {
-        prog_with_args: TestProgram::File(args.file.clone()).read_program(),
+        prog_with_args: file.read_program(),
         test_type: args.run_mode,
         interp: args.interp,
         profile_out: args.profile_out,

src/util.rs

@@ -3,6 +3,7 @@ use crate::{EggCCError, Optimizer};
 use bril_rs::Program;
 use clap::ValueEnum;
 use std::fmt::Debug;
+use std::io::Read;
 use std::{
     ffi::OsStr,
     fmt::{Display, Formatter},
@@ -144,7 +145,7 @@ where
 pub enum RunType {
     /// Do nothing to the input bril program besides parse it.
     /// Output the original program.
-    Nothing,
+    Parse,
     /// Convert the input bril program to the tree encoding, optimize the program
     /// using egglog, and output the resulting bril program.
     /// The default way to run this tool.
@@ -185,6 +186,8 @@ pub enum RunType {
     OptimizeDirectJumps,
     /// Convert the original program to a RVSDG and then to a CFG, outputting one SVG per function.
     RvsdgToCfg,
+    /// Convert Rust to bril
+    RustToBril,
 }
 
 impl Display for RunType {
@@ -198,7 +201,7 @@ impl RunType {
     /// that can be interpreted.
     pub fn produces_interpretable(&self) -> bool {
         match self {
-            RunType::Nothing => true,
+            RunType::Parse => true,
             RunType::Optimize => true,
             RunType::RvsdgConversion => false,
             RunType::RvsdgRoundTrip => true,
@@ -214,6 +217,7 @@ impl RunType {
             RunType::TreeOptimize => true,
             RunType::Egglog => true,
             RunType::CheckTreeIdentical => false,
+            RunType::RustToBril => true,
         }
     }
 }
@@ -228,14 +232,15 @@ pub struct ProgWithArguments {
 #[derive(Clone)]
 pub enum TestProgram {
     Prog(ProgWithArguments),
-    File(PathBuf),
+    BrilFile(PathBuf),
+    RustFile(PathBuf),
 }
 
 impl TestProgram {
     pub fn read_program(self) -> ProgWithArguments {
         match self {
             TestProgram::Prog(prog) => prog,
-            TestProgram::File(path) => {
+            TestProgram::BrilFile(path) => {
                 let program_read = std::fs::read_to_string(path.clone()).unwrap();
                 let args = Optimizer::parse_bril_args(&program_read);
                 let program = Optimizer::parse_bril(&program_read).unwrap();
@@ -247,6 +252,21 @@ impl TestProgram {
                     args,
                 }
             }
+            TestProgram::RustFile(path) => {
+                let mut src = String::new();
+                let mut file = std::fs::File::open(path.clone()).unwrap();
+
+                file.read_to_string(&mut src).unwrap();
+                let syntax = syn::parse_file(&src).unwrap();
+                let name = path.display().to_string();
+                let program = rs2bril::from_file_to_program(syntax, false, Some(name.clone()));
+
+                ProgWithArguments {
+                    program,
+                    name,
+                    args: vec![],
+                }
+            }
         }
     }
 }
@@ -340,7 +360,7 @@ impl Run {
         };
 
         let (visualizations, interpretable_out) = match self.test_type {
-            RunType::Nothing => (
+            RunType::Parse => (
                 vec![],
                 Some(Interpretable::Bril(self.prog_with_args.program.clone())),
             ),
@@ -522,6 +542,17 @@ impl Run {
                     Some(Interpretable::Bril(bril)),
                 )
             }
+            RunType::RustToBril => {
+                let bril = &self.prog_with_args.program;
+                (
+                    vec![Visualization {
+                        result: bril.to_string(),
+                        file_extension: ".bril".to_string(),
+                        name: self.prog_with_args.name.clone(),
+                    }],
+                    Some(Interpretable::Bril(bril.clone())),
+                )
+            }
         };
 
         let result_interpreted = if !self.interp {

tests/files.rs

@@ -43,7 +43,7 @@ fn generate_tests(glob: &str) -> Vec<Trial> {
 
         let snapshot = f.to_str().unwrap().contains("small");
 
-        for run in Run::all_configurations_for(TestProgram::File(f)) {
+        for run in Run::all_configurations_for(TestProgram::BrilFile(f)) {
             mk_trial(run, snapshot);
         }
     }

tree_in_context/Cargo.toml

@@ -11,4 +11,4 @@ strum = "0.25"
 strum_macros = "0.25"
 main_error = "0.1.2"
 thiserror = "1.0"
-bril-rs = { git = "https://github.com/sampsyo/bril", rev = "daaff28" }
+bril-rs = { git = "https://github.com/ajpal/bril", rev = "a27a351" }