split generated op.rs into op.rs and op_code.rs

Author: Robbepop

crates/ir2/build/mod.rs

@@ -67,15 +67,16 @@ pub fn generate_code(config: &Config) -> Result<(), Error> {
     let isa = isa::wasmi_isa(config);
     let mut buffer = String::new();
     generate_op_rs(config, &isa, &mut buffer)?;
+    generate_op_code_rs(config, &isa, &mut buffer)?;
     generate_encode_rs(config, &isa, &mut buffer)?;
     generate_decode_rs(config, &isa, &mut buffer)?;
     Ok(())
 }
 
 fn generate_op_rs(config: &Config, isa: &Isa, contents: &mut String) -> Result<(), Error> {
     let expected_size = match config.simd {
-        true => 330_000,
-        false => 210_000,
+        true => 210_000,
+        false => 135_000,
     };
     write_to_buffer(contents, expected_size, |buffer| {
         write!(
@@ -84,18 +85,28 @@ fn generate_op_rs(config: &Config, isa: &Isa, contents: &mut String) -> Result<(
             {}\n\
             {}\n\
             {}\n\
-            {}\n\
             ",
             DisplayOp::new(isa, Indent::default()),
             DisplayResultMut::new(isa, Indent::default()),
             DisplayConstructor::new(isa, Indent::default()),
-            DisplayOpCode::new(isa, Indent::default()),
         )
     })?;
     fs::write(config.out_dir.join("op.rs"), contents)?;
     Ok(())
 }
 
+fn generate_op_code_rs(config: &Config, isa: &Isa, contents: &mut String) -> Result<(), Error> {
+    let expected_size = match config.simd {
+        true => 125_000,
+        false => 80_000,
+    };
+    write_to_buffer(contents, expected_size, |buffer| {
+        writeln!(buffer, "{}", DisplayOpCode::new(isa, Indent::default()),)
+    })?;
+    fs::write(config.out_dir.join("op_code.rs"), contents)?;
+    Ok(())
+}
+
 fn generate_encode_rs(config: &Config, isa: &Isa, contents: &mut String) -> Result<(), Error> {
     let expected_size = match config.simd {
         true => 115_000,

crates/ir2/src/lib.rs

@@ -9,6 +9,7 @@ mod encode;
 mod error;
 pub mod index;
 mod op;
+mod opcode;
 mod primitive;
 mod span;
 
@@ -20,7 +21,8 @@ pub use self::{
     encode::{Encode, Encoder},
     error::Error,
     index::Slot,
-    op::{InvalidOpCode, Op, OpCode},
+    op::Op,
+    opcode::{InvalidOpCode, OpCode},
     primitive::{Address, BlockFuel, BranchOffset, Offset16, Sign},
     span::{BoundedSlotSpan, FixedSlotSpan, SlotSpan, SlotSpanIter},
 };

crates/ir2/src/op.rs

@@ -23,24 +23,8 @@ impl Clone for Op {
     }
 }
 
-impl Copy for OpCode {}
-impl Clone for OpCode {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-impl From<OpCode> for u16 {
-    fn from(code: OpCode) -> Self {
-        code as u16
-    }
-}
-
 #[test]
 fn op_size_of_and_alignment() {
     assert_eq!(core::mem::size_of::<Op>(), 24);
     assert_eq!(core::mem::align_of::<Op>(), 8);
 }
-
-/// Indicated an invalid `u16` value for an [`OpCode`].
-#[derive(Debug, Copy, Clone)]
-pub struct InvalidOpCode;

crates/ir2/src/opcode.rs

@@ -0,0 +1,19 @@
+use crate::Op;
+
+include!(concat!(env!("OUT_DIR"), "/op_code.rs"));
+
+impl Copy for OpCode {}
+impl Clone for OpCode {
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+impl From<OpCode> for u16 {
+    fn from(code: OpCode) -> Self {
+        code as u16
+    }
+}
+
+/// Indicated an invalid `u16` value for an [`OpCode`].
+#[derive(Debug, Copy, Clone)]
+pub struct InvalidOpCode;