Improvements

Author: bjorn3

gen_intrinsics/src/def_visitor.rs

@@ -54,6 +54,10 @@ impl<'ast> Visit<'ast> for DefVisitor {
             return;
         }
 
+        if i.ident.to_string() == "JustOne" {
+            return; // Multiple definitions across modules
+        }
+
         let mut ty = i.clone();
         ty.attrs = ty.attrs.into_iter().filter(|attr| attr.path().is_ident("repr")).collect();
 
@@ -156,6 +160,11 @@ impl<'ast> Visit<'ast> for DefVisitor {
                         | "llvm.aarch64.crypto.sm3tt2a"
                         | "llvm.aarch64.crypto.sm3tt2b"
                         | "llvm.aarch64.tcancel" => continue 'items,
+
+                        "llvm.aarch64.addg" | "llvm.aarch64.gmi" | "llvm.aarch64.irg"
+                        | "llvm.aarch64.ldg" | "llvm.aarch64.stg" | "llvm.aarch64.subp" => {
+                            continue 'items;
+                        }
                         _ => {}
                     }
 

gen_intrinsics/src/main.rs

@@ -113,9 +113,7 @@ fn main() {
             section.size(),
         );
 
-        let data = section.data().unwrap();
-        let (code, ret) = data.split_at(data.len() - 4);
-        assert_eq!(ret, [0xc0_u8, 0x03, 0x5f, 0xd6]); // arm64 ret instruction
+        let code = section.data().unwrap();
 
         let args = sig
             .inputs

src/intrinsics/llvm_aarch64.rs

@@ -18,11 +18,18 @@ fn call_asm<'tcx>(
     let name = format!("__rust_cranelift_{name}");
     let is_defined = fx.module.declarations().get_name(&name).is_none();
 
-    let sig = Signature { params: todo!(), returns: todo!(), call_conv: CallConv::SystemV };
+    let sig = Signature {
+        params: args
+            .iter()
+            .map(|arg| AbiParam::new(fx.clif_type(arg.layout().ty).unwrap()))
+            .collect(),
+        returns: vec![AbiParam::new(fx.clif_type(ret.layout().ty).unwrap())],
+        call_conv: CallConv::SystemV,
+    };
 
     let func = fx.module.declare_function(&name, Linkage::Local, &sig).unwrap();
     if !is_defined {
-        todo!("define");
+        fx.module.define_function_bytes(func, &Function::new(), 4, &code, &[]).unwrap();
     }
 
     let func_ref = fx.module.declare_func_in_func(func, &mut fx.bcx.func);
@@ -478,19 +485,19 @@ pub(crate) fn codegen_aarch64_llvm_intrinsic_call<'tcx>(
         // ==== begin autogenerated section ====
         "llvm.trunc.v1f64" => {
             intrinsic_args!(fx, args => (a); intrinsic);
-            call_asm(fx, "llvm__trunc__v1f64", &[a], ret, &[0, 192, 101, 30]);
+            call_asm(fx, "llvm__trunc__v1f64", &[a], ret, &[0, 192, 101, 30, 192, 3, 95, 214]);
         }
         "llvm.trunc.v2f32" => {
             intrinsic_args!(fx, args => (a); intrinsic);
-            call_asm(fx, "llvm__trunc__v2f32", &[a], ret, &[0, 152, 161, 14]);
+            call_asm(fx, "llvm__trunc__v2f32", &[a], ret, &[0, 152, 161, 14, 192, 3, 95, 214]);
         }
         "llvm.trunc.v2f64" => {
             intrinsic_args!(fx, args => (a); intrinsic);
-            call_asm(fx, "llvm__trunc__v2f64", &[a], ret, &[0, 152, 225, 78]);
+            call_asm(fx, "llvm__trunc__v2f64", &[a], ret, &[0, 152, 225, 78, 192, 3, 95, 214]);
         }
         "llvm.trunc.v4f32" => {
             intrinsic_args!(fx, args => (a); intrinsic);
-            call_asm(fx, "llvm__trunc__v4f32", &[a], ret, &[0, 152, 161, 78]);
+            call_asm(fx, "llvm__trunc__v4f32", &[a], ret, &[0, 152, 161, 78, 192, 3, 95, 214]);
         }
         // ==== end autogenerated section