Merge branch 'main' into workflow-small-execute-blocks

lambdaclass · Oct 21, 2024 · 51556dc · 51556dc
2 parents aea6a54 + 355c250
commit 51556dc
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 381 deletions.
diff --git a/programs/benches/factorial_2M.c b/programs/benches/factorial_2M.c
@@ -16,7 +16,6 @@ typedef struct factorial_return_values
     } result;
 } factorial_return_values_t;
 
-extern uint64_t* builtin_costs;
 
 static void run_bench(factorial_return_values_t*, uint64_t)
 __attribute__((weakref("_mlir_ciface_factorial_2M::factorial_2M::main(f1)")));
@@ -26,10 +25,6 @@ int main()
 {
     factorial_return_values_t return_values;
 
-    uint64_t BuiltinCosts[7] = {1, 4050, 583, 4085, 491, 230, 604};
-
-    builtin_costs = &BuiltinCosts[0];
-
     run_bench(&return_values, 0);
     assert(return_values.result.discriminant == 0);
 

diff --git a/programs/benches/fib_2M.c b/programs/benches/fib_2M.c
@@ -16,18 +16,13 @@ typedef struct fib_return_values
     } result;
 } fib_return_values_t;
 
-extern uint64_t* builtin_costs;
 
 static void run_bench(fib_return_values_t *, uint64_t)
     __attribute__((weakref("_mlir_ciface_fib_2M::fib_2M::main(f1)")));
 
 
 int main()
 {
-    uint64_t BuiltinCosts[7] = {1, 4050, 583, 4085, 491, 230, 604};
-
-    builtin_costs = &BuiltinCosts[0];
-
     fib_return_values_t return_values;
 
     run_bench(&return_values, 0);

diff --git a/programs/benches/logistic_map.c b/programs/benches/logistic_map.c
@@ -16,18 +16,13 @@ typedef struct map_return_values
     } result;
 } map_return_values_t;
 
-extern uint64_t* builtin_costs;
 
 static void run_bench(map_return_values_t *, uint64_t)
     __attribute__((weakref("_mlir_ciface_logistic_map::logistic_map::main(f2)")));
 
 
 int main()
 {
-    uint64_t BuiltinCosts[7] = {1, 4050, 583, 4085, 491, 230, 604};
-
-    builtin_costs = &BuiltinCosts[0];
-
     map_return_values_t return_values;
 
     run_bench(&return_values, 0);

diff --git a/src/compiler.rs b/src/compiler.rs
@@ -74,7 +74,7 @@ use melior::{
         arith::CmpiPredicate,
         cf, func, index,
         llvm::{self, LoadStoreOptions},
-        memref, ods,
+        memref,
     },
     ir::{
         attribute::{
@@ -135,30 +135,6 @@ pub fn compile(
         }
     }
 
-    {
-        // Add the builtin_costs global.
-        // We always add it because symbol look up otherwise can panic.
-        let region = Region::new();
-        let location = Location::unknown(context);
-        let block = region.append_block(Block::new(&[]));
-        let value = block.append_op_result(
-            ods::llvm::mlir_zero(context, llvm::r#type::pointer(context, 0), location).into(),
-        )?;
-        block.append_operation(melior::dialect::llvm::r#return(Some(value), location));
-
-        module.body().append_operation(
-            ods::llvm::mlir_global(
-                context,
-                region,
-                TypeAttribute::new(llvm::r#type::pointer(context, 0)),
-                StringAttribute::new(context, "builtin_costs"),
-                Attribute::parse(context, "#llvm.linkage<external>").unwrap(),
-                location,
-            )
-            .into(),
-        );
-    }
-
     // Sierra programs have the following structure:
     //   1. Type declarations, one per line.
     //   2. Libfunc declarations, one per line.
@@ -470,7 +446,7 @@ fn compile_func(
         initial_state,
         |statement_idx, mut state| {
             if let Some(gas_metadata) = metadata.get::<GasMetadata>() {
-                let gas_cost = gas_metadata.get_gas_costs_for_statement(statement_idx);
+                let gas_cost = gas_metadata.get_gas_cost_for_statement(statement_idx);
                 metadata.remove::<GasCost>();
                 metadata.insert(GasCost(gas_cost));
             }

diff --git a/src/error.rs b/src/error.rs
@@ -69,9 +69,6 @@ pub enum Error {
     #[error("integer conversion failed")]
     IntegerConversion,
 
-    #[error("missing BuiltinCosts global symbol, should never happen, this is a bug")]
-    MissingBuiltinCostsSymbol,
-
     #[error(transparent)]
     IoError(#[from] std::io::Error),
 

diff --git a/src/executor.rs b/src/executor.rs
@@ -10,7 +10,7 @@ use crate::{
     execution_result::{BuiltinStats, ExecutionResult},
     starknet::{handler::StarknetSyscallHandlerCallbacks, StarknetSyscallHandler},
     types::TypeBuilder,
-    utils::{libc_free, BuiltinCosts, RangeExt},
+    utils::{libc_free, RangeExt},
     values::Value,
 };
 use bumpalo::Bump;
@@ -69,7 +69,6 @@ extern "C" {
 fn invoke_dynamic(
     registry: &ProgramRegistry<CoreType, CoreLibfunc>,
     function_ptr: *const c_void,
-    builtin_costs_ptr: Option<*mut c_void>,
     function_signature: &FunctionSignature,
     args: &[Value],
     gas: u128,
@@ -142,15 +141,6 @@ fn invoke_dynamic(
         previous_syscall_handler
     });
 
-    // Order matters, for the libfunc impl
-    let builtin_costs: [u64; 7] = BuiltinCosts::default().into();
-
-    if let Some(builtin_costs_ptr) = builtin_costs_ptr {
-        unsafe {
-            *builtin_costs_ptr.cast() = builtin_costs.as_ptr();
-        }
-    }
-
     // Generate argument list.
     let mut iter = args.iter();
     for item in function_signature.param_types.iter().filter_map(|type_id| {
@@ -176,13 +166,6 @@ fn invoke_dynamic(
                 (syscall_handler as *mut StarknetSyscallHandlerCallbacks<_>)
                     .to_bytes(&mut invoke_data)?;
             }
-            CoreTypeConcrete::BuiltinCosts(_) => {
-                if let Some(builtin_costs_ptr) = builtin_costs_ptr {
-                    builtin_costs_ptr.to_bytes(&mut invoke_data)?;
-                } else {
-                    (builtin_costs.as_ptr()).to_bytes(&mut invoke_data)?;
-                }
-            }
             type_info if type_info.is_builtin() => 0u64.to_bytes(&mut invoke_data)?,
             type_info => ValueWithInfoWrapper {
                 value: iter.next().unwrap(),
@@ -266,38 +249,26 @@ fn invoke_dynamic(
             },
             _ if type_info.is_builtin() => {
                 if !type_info.is_zst(registry)? {
-                    if let CoreTypeConcrete::BuiltinCosts(_) = type_info {
-                        // todo: should we use this value?
-                        let _value = match &mut return_ptr {
-                            Some(return_ptr) => unsafe { *read_value::<*mut u64>(return_ptr) },
-                            None => ret_registers[0] as *mut u64,
-                        };
-                    } else {
-                        let value = match &mut return_ptr {
-                            Some(return_ptr) => unsafe { *read_value::<u64>(return_ptr) },
-                            None => ret_registers[0],
-                        } as usize;
-
-                        match type_info {
-                            CoreTypeConcrete::Bitwise(_) => builtin_stats.bitwise = value,
-                            CoreTypeConcrete::EcOp(_) => builtin_stats.ec_op = value,
-                            CoreTypeConcrete::RangeCheck(_) => builtin_stats.range_check = value,
-                            CoreTypeConcrete::Pedersen(_) => builtin_stats.pedersen = value,
-                            CoreTypeConcrete::Poseidon(_) => builtin_stats.poseidon = value,
-                            CoreTypeConcrete::SegmentArena(_) => {
-                                builtin_stats.segment_arena = value
-                            }
-                            CoreTypeConcrete::RangeCheck96(_) => {
-                                builtin_stats.range_check_96 = value
-                            }
-                            CoreTypeConcrete::Circuit(CircuitTypeConcrete::AddMod(_)) => {
-                                builtin_stats.circuit_add = value
-                            }
-                            CoreTypeConcrete::Circuit(CircuitTypeConcrete::MulMod(_)) => {
-                                builtin_stats.circuit_mul = value
-                            }
-                            _ => unreachable!("{type_id:?}"),
+                    let value = match &mut return_ptr {
+                        Some(return_ptr) => unsafe { *read_value::<u64>(return_ptr) },
+                        None => ret_registers[0],
+                    } as usize;
+
+                    match type_info {
+                        CoreTypeConcrete::Bitwise(_) => builtin_stats.bitwise = value,
+                        CoreTypeConcrete::EcOp(_) => builtin_stats.ec_op = value,
+                        CoreTypeConcrete::RangeCheck(_) => builtin_stats.range_check = value,
+                        CoreTypeConcrete::Pedersen(_) => builtin_stats.pedersen = value,
+                        CoreTypeConcrete::Poseidon(_) => builtin_stats.poseidon = value,
+                        CoreTypeConcrete::SegmentArena(_) => builtin_stats.segment_arena = value,
+                        CoreTypeConcrete::RangeCheck96(_) => builtin_stats.range_check_96 = value,
+                        CoreTypeConcrete::Circuit(CircuitTypeConcrete::AddMod(_)) => {
+                            builtin_stats.circuit_add = value
+                        }
+                        CoreTypeConcrete::Circuit(CircuitTypeConcrete::MulMod(_)) => {
+                            builtin_stats.circuit_mul = value
                         }
+                        _ => unreachable!("{type_id:?}"),
                     }
                 }
             }

diff --git a/src/executor/aot.rs b/src/executor/aot.rs
@@ -81,7 +81,6 @@ impl AotNativeExecutor {
         super::invoke_dynamic(
             &self.registry,
             self.find_function_ptr(function_id),
-            self.find_symbol_ptr("builtin_costs"),
             self.extract_signature(function_id),
             args,
             available_gas,
@@ -104,7 +103,6 @@ impl AotNativeExecutor {
         super::invoke_dynamic(
             &self.registry,
             self.find_function_ptr(function_id),
-            self.find_symbol_ptr("builtin_costs"),
             self.extract_signature(function_id),
             args,
             available_gas,
@@ -127,7 +125,6 @@ impl AotNativeExecutor {
         ContractExecutionResult::from_execution_result(super::invoke_dynamic(
             &self.registry,
             self.find_function_ptr(function_id),
-            self.find_symbol_ptr("builtin_costs"),
             self.extract_signature(function_id),
             &[Value::Struct {
                 fields: vec![Value::Array(
@@ -155,15 +152,6 @@ impl AotNativeExecutor {
         }
     }
 
-    pub fn find_symbol_ptr(&self, name: &str) -> Option<*mut c_void> {
-        unsafe {
-            self.library
-                .get::<*mut ()>(name.as_bytes())
-                .ok()
-                .map(|x| x.into_raw().into_raw())
-        }
-    }
-
     fn extract_signature(&self, function_id: &FunctionId) -> &FunctionSignature {
         &self.registry.get_function(function_id).unwrap().signature
     }