Small refactor and util for OptLevel

src/bin/cairo-native-compile.rs

@@ -1,7 +1,7 @@
 use anyhow::Context;
 use cairo_native::{
     context::NativeContext, module_to_object, object_to_shared_lib,
-    utils::cairo_to_sierra_with_debug_info, OptLevel,
+    utils::cairo_to_sierra_with_debug_info,
 };
 use clap::{Parser, ValueEnum};
 use std::path::{Path, PathBuf};
@@ -60,13 +60,6 @@ fn main() -> anyhow::Result<()> {
         .compile(&sierra_program, Some(debug_locations))
         .unwrap();
 
-    let opt_level = match args.opt_level {
-        0 => OptLevel::None,
-        1 => OptLevel::Less,
-        2 => OptLevel::Default,
-        _ => OptLevel::Aggressive,
-    };
-
     let output_mlir = args
         .output_mlir
         .unwrap_or_else(|| PathBuf::from("out.mlir"));
@@ -78,7 +71,7 @@ fn main() -> anyhow::Result<()> {
     .context("Failed to write output.")?;
 
     if let Some(output_library) = &args.output_library {
-        let object_data = module_to_object(native_module.module(), opt_level)
+        let object_data = module_to_object(native_module.module(), args.opt_level.into())
             .context("Failed to convert module to object.")?;
         object_to_shared_lib(&object_data, output_library)
             .context("Failed to write shared library.")?;

src/bin/cairo-native-run.rs

@@ -17,7 +17,6 @@ use cairo_native::{
     executor::{AotNativeExecutor, JitNativeExecutor, NativeExecutor},
     metadata::gas::{GasMetadata, MetadataComputationConfig},
     values::JitValue,
-    OptLevel,
 };
 use clap::{Parser, ValueEnum};
 use itertools::Itertools;
@@ -111,16 +110,13 @@ fn main() -> anyhow::Result<()> {
         .compile(&sierra_program, Some(debug_locations))
         .unwrap();
 
-    let opt_level = match args.opt_level {
-        0 => OptLevel::None,
-        1 => OptLevel::Less,
-        2 => OptLevel::Default,
-        _ => OptLevel::Aggressive,
-    };
-
     let native_executor: NativeExecutor = match args.run_mode {
-        RunMode::Aot => AotNativeExecutor::from_native_module(native_module, opt_level).into(),
-        RunMode::Jit => JitNativeExecutor::from_native_module(native_module, opt_level).into(),
+        RunMode::Aot => {
+            AotNativeExecutor::from_native_module(native_module, args.opt_level.into()).into()
+        }
+        RunMode::Jit => {
+            JitNativeExecutor::from_native_module(native_module, args.opt_level.into()).into()
+        }
     };
 
     let gas_metadata =

src/bin/cairo-native-test.rs

@@ -23,7 +23,6 @@ use cairo_native::{
     executor::{AotNativeExecutor, JitNativeExecutor, NativeExecutor},
     metadata::gas::{GasMetadata, MetadataComputationConfig},
     values::JitValue,
-    OptLevel,
 };
 use clap::{Parser, ValueEnum};
 use colored::Colorize;
@@ -390,16 +389,13 @@ fn run_tests(
         )
         .unwrap();
 
-    let opt_level = match args.opt_level {
-        0 => OptLevel::None,
-        1 => OptLevel::Less,
-        2 => OptLevel::Default,
-        _ => OptLevel::Aggressive,
-    };
-
     let native_executor: NativeExecutor = match args.run_mode {
-        RunMode::Aot => AotNativeExecutor::from_native_module(native_module, opt_level).into(),
-        RunMode::Jit => JitNativeExecutor::from_native_module(native_module, opt_level).into(),
+        RunMode::Aot => {
+            AotNativeExecutor::from_native_module(native_module, args.opt_level.into()).into()
+        }
+        RunMode::Jit => {
+            JitNativeExecutor::from_native_module(native_module, args.opt_level.into()).into()
+        }
     };
 
     let gas_metadata = GasMetadata::new(

src/executor.rs

@@ -130,9 +130,6 @@ fn invoke_dynamic(
 ) -> ExecutionResult {
     tracing::info!("Invoking function with signature: {function_signature:?}.");
 
-    let is_builtin = <CoreTypeConcrete as TypeBuilder>::is_builtin;
-    let is_zst = <CoreTypeConcrete as TypeBuilder>::is_zst;
-
     let arena = Bump::new();
     let mut invoke_data = ArgumentMapper::new(&arena, registry);
 
@@ -267,8 +264,8 @@ fn invoke_dynamic(
                 },
                 None => {}
             },
-            _ if is_builtin(type_info) => {
-                if !is_zst(type_info, registry) {
+            _ if type_info.is_builtin() => {
+                if !type_info.is_zst(registry) {
                     let value = match &mut return_ptr {
                         Some(return_ptr) => unsafe { *read_value::<u64>(return_ptr) },
                         None => ret_registers[0],

src/ffi.rs

@@ -72,6 +72,39 @@ pub enum OptLevel {
     Aggressive,
 }
 
+impl From<usize> for OptLevel {
+    fn from(value: usize) -> Self {
+        match value {
+            0 => OptLevel::None,
+            1 => OptLevel::Less,
+            2 => OptLevel::Default,
+            _ => OptLevel::Aggressive,
+        }
+    }
+}
+
+impl From<OptLevel> for usize {
+    fn from(val: OptLevel) -> Self {
+        match val {
+            OptLevel::None => 0,
+            OptLevel::Less => 1,
+            OptLevel::Default => 2,
+            OptLevel::Aggressive => 3,
+        }
+    }
+}
+
+impl From<u8> for OptLevel {
+    fn from(value: u8) -> Self {
+        match value {
+            0 => OptLevel::None,
+            1 => OptLevel::Less,
+            2 => OptLevel::Default,
+            _ => OptLevel::Aggressive,
+        }
+    }
+}
+
 /// Make sure to call
 pub fn module_to_object(
     module: &Module<'_>,

src/utils.rs

@@ -224,17 +224,7 @@ pub fn create_engine(
     opt_level: OptLevel,
 ) -> ExecutionEngine {
     // Create the JIT engine.
-    let engine = ExecutionEngine::new(
-        module,
-        match opt_level {
-            OptLevel::None => 0,
-            OptLevel::Less => 1,
-            OptLevel::Default => 2,
-            OptLevel::Aggressive => 3,
-        },
-        &[],
-        false,
-    );
+    let engine = ExecutionEngine::new(module, opt_level.into(), &[], false);
 
     #[cfg(feature = "with-runtime")]
     register_runtime_symbols(&engine);