Better function attributes and re-enable >O1 opt (#843)

* Fix felt252 and enum deserialization bugs. * Fix formatting. * Also fix the runtime. * Fix errors. * try to fix ci * remove unused deps * proper function attributes * add proper function attrs to optimize better, add some passes, run tests with atleast some opts * dont use remi * oops * maybe with opt level 3 now it works * test * works * readd deleted bench * remove dbg * Update bench-hyperfine.sh * fixci * comment * Update src/ffi.rs Co-authored-by: MrAzteca <[email protected]> --------- Co-authored-by: Esteve Soler Arderiu <[email protected]> Co-authored-by: Esteve Soler Arderiu <[email protected]> Co-authored-by: MrAzteca <[email protected]>
lambdaclass · Oct 16, 2024 · 7c4ff7f · 7c4ff7f
1 parent 84ceaa3
commit 7c4ff7f
Show file tree

Hide file tree

Showing 9 changed files with 247 additions and 92 deletions.
diff --git a/Makefile b/Makefile
@@ -95,7 +95,8 @@ doc-open: check-llvm
 	cargo doc --all-features --no-deps --workspace --open
 
 .PHONY: bench
-bench: build needs-cairo2 runtime
+bench: needs-cairo2 runtime
+	cargo b --release --bin cairo-native-run
 	./scripts/bench-hyperfine.sh
 
 .PHONY: bench-ci

diff --git a/src/compiler.rs b/src/compiler.rs
@@ -922,12 +922,16 @@ fn compile_func(
         &[
             (
                 Identifier::new(context, "sym_visibility"),
-                StringAttribute::new(context, "public").into(),
+                StringAttribute::new(context, "private").into(),
+            ),
+            (
+                Identifier::new(context, "linkage"),
+                Attribute::parse(context, "#llvm.linkage<private>").unwrap(),
+            ),
+            (
+                Identifier::new(context, "CConv"),
+                Attribute::parse(context, "#llvm.cconv<fastcc>").unwrap(),
             ),
-            // (
-            //     Identifier::new(context, "CConv"),
-            //     Attribute::parse(context, "#llvm.cconv<tailcc>").unwrap(),
-            // ),
         ],
         Location::fused(
             context,
@@ -1351,10 +1355,10 @@ fn generate_entry_point_wrapper<'c>(
                     Identifier::new(context, "callee"),
                     FlatSymbolRefAttribute::new(context, private_symbol).into(),
                 ),
-                // (
-                //     Identifier::new(context, "CConv"),
-                //     Attribute::parse(context, "#llvm.cconv<tailcc>").unwrap(),
-                // ),
+                (
+                    Identifier::new(context, "CConv"),
+                    Attribute::parse(context, "#llvm.cconv<fastcc>").unwrap(),
+                ),
             ])
             .add_operands(&args)
             .add_results(&[llvm::r#type::r#struct(context, ret_types, false)])
@@ -1385,6 +1389,14 @@ fn generate_entry_point_wrapper<'c>(
                 Identifier::new(context, "sym_visibility"),
                 StringAttribute::new(context, "public").into(),
             ),
+            (
+                Identifier::new(context, "llvm.linkage"),
+                Attribute::parse(context, "#llvm.linkage<private>").unwrap(),
+            ),
+            (
+                Identifier::new(context, "llvm.CConv"),
+                Attribute::parse(context, "#llvm.cconv<fastcc>").unwrap(),
+            ),
             (
                 Identifier::new(context, "llvm.emit_c_interface"),
                 Attribute::unit(context),

diff --git a/src/ffi.rs b/src/ffi.rs
@@ -143,7 +143,7 @@ pub fn module_to_object(module: &Module<'_>, opt_level: OptLevel) -> Result<Vec<
                 OptLevel::Default => LLVMCodeGenOptLevel::LLVMCodeGenLevelDefault,
                 OptLevel::Aggressive => LLVMCodeGenOptLevel::LLVMCodeGenLevelAggressive,
             },
-            LLVMRelocMode::LLVMRelocDynamicNoPic,
+            LLVMRelocMode::LLVMRelocPIC,
             LLVMCodeModel::LLVMCodeModelDefault,
         );
 
@@ -152,8 +152,11 @@ pub fn module_to_object(module: &Module<'_>, opt_level: OptLevel) -> Result<Vec<
         let opt = match opt_level {
             OptLevel::None => 0,
             OptLevel::Less => 1,
-            OptLevel::Default => 1, // todo: change once slp-vectorizer pass is fixed on llvm
-            OptLevel::Aggressive => 1, // https://github.com/llvm/llvm-project/issues/107198
+            // slp-vectorizer pass did cause some issues, but after the change
+            // on function attributes it seems to not trigger them anymore.
+            // https://github.com/llvm/llvm-project/issues/107198
+            OptLevel::Default => 2,
+            OptLevel::Aggressive => 3,
         };
         let passes = CString::new(format!("default<O{opt}>")).unwrap();
         let error = LLVMRunPasses(llvm_module, passes.as_ptr(), machine, opts);

diff --git a/src/libfuncs/function_call.rs b/src/libfuncs/function_call.rs
@@ -23,7 +23,7 @@ use melior::{
         attribute::{DenseI32ArrayAttribute, FlatSymbolRefAttribute},
         operation::OperationBuilder,
         r#type::IntegerType,
-        Block, Identifier, Location, Type, Value,
+        Attribute, Block, Identifier, Location, Type, Value,
     },
     Context,
 };
@@ -195,10 +195,10 @@ pub fn build<'ctx, 'this>(
                         )
                         .into(),
                     ),
-                    // (
-                    //     Identifier::new(context, "CConv"),
-                    //     Attribute::parse(context, "#llvm.cconv<tailcc>").unwrap(),
-                    // ),
+                    (
+                        Identifier::new(context, "CConv"),
+                        Attribute::parse(context, "#llvm.cconv<fastcc>").unwrap(),
+                    ),
                 ])
                 .add_operands(&arguments)
                 .add_results(&[llvm::r#type::r#struct(context, &result_types, false)])

diff --git a/src/metadata/drop_overrides.rs b/src/metadata/drop_overrides.rs
@@ -32,7 +32,7 @@ use melior::{
     ir::{
         attribute::{FlatSymbolRefAttribute, StringAttribute, TypeAttribute},
         r#type::FunctionType,
-        Block, Location, Module, Region, Value,
+        Attribute, Block, Identifier, Location, Module, Region, Value,
     },
     Context,
 };
@@ -85,7 +85,20 @@ impl DropOverridesMeta {
                     StringAttribute::new(context, &format!("drop${}", id.id)),
                     TypeAttribute::new(FunctionType::new(context, &[ty], &[]).into()),
                     region,
-                    &[],
+                    &[
+                        (
+                            Identifier::new(context, "sym_visibility"),
+                            StringAttribute::new(context, "public").into(),
+                        ),
+                        (
+                            Identifier::new(context, "llvm.CConv"),
+                            Attribute::parse(context, "#llvm.cconv<fastcc>").unwrap(),
+                        ),
+                        (
+                            Identifier::new(context, "llvm.linkage"),
+                            Attribute::parse(context, "#llvm.linkage<private>").unwrap(),
+                        ),
+                    ],
                     Location::unknown(context),
                 ));
             }

diff --git a/src/metadata/dup_overrides.rs b/src/metadata/dup_overrides.rs
@@ -32,7 +32,7 @@ use melior::{
     ir::{
         attribute::{FlatSymbolRefAttribute, StringAttribute, TypeAttribute},
         r#type::FunctionType,
-        Block, Location, Module, Region, Value, ValueLike,
+        Attribute, Block, Identifier, Location, Module, Region, Value, ValueLike,
     },
     Context,
 };
@@ -85,7 +85,20 @@ impl DupOverridesMeta {
                     StringAttribute::new(context, &format!("dup${}", id.id)),
                     TypeAttribute::new(FunctionType::new(context, &[ty], &[ty, ty]).into()),
                     region,
-                    &[],
+                    &[
+                        (
+                            Identifier::new(context, "sym_visibility"),
+                            StringAttribute::new(context, "public").into(),
+                        ),
+                        (
+                            Identifier::new(context, "llvm.CConv"),
+                            Attribute::parse(context, "#llvm.cconv<fastcc>").unwrap(),
+                        ),
+                        (
+                            Identifier::new(context, "llvm.linkage"),
+                            Attribute::parse(context, "#llvm.linkage<private>").unwrap(),
+                        ),
+                    ],
                     Location::unknown(context),
                 ));
             }