maybe with opt level 3 now it works

lambdaclass · Oct 14, 2024 · 5451f28 · 5451f28
1 parent d0490a2
commit 5451f28
Show file tree

Hide file tree

Showing 4 changed files with 186 additions and 72 deletions.
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,8 @@ 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
+            OptLevel::Default => 2, // todo: change once slp-vectorizer pass is fixed on llvm
+            OptLevel::Aggressive => 3, // https://github.com/llvm/llvm-project/issues/107198
         };
         let passes = CString::new(format!("default<O{opt}>")).unwrap();
         let error = LLVMRunPasses(llvm_module, passes.as_ptr(), machine, opts);

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,16 @@ 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, "private").into(),
+                        ),
+                        (
+                            Identifier::new(context, "llvm.linkage"),
+                            Attribute::parse(context, "#llvm.linkage<internal>").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,16 @@ 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, "private").into(),
+                        ),
+                        (
+                            Identifier::new(context, "llvm.linkage"),
+                            Attribute::parse(context, "#llvm.linkage<internal>").unwrap(),
+                        ),
+                    ],
                     Location::unknown(context),
                 ));
             }