Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Intrinsics as calls #1585

Merged
merged 3 commits into from
Feb 6, 2025
Merged

Intrinsics as calls #1585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f5567c
Don't abort compilation for LLVM hint functions.
ltratt Feb 5, 2025
ee773ad
Implement codegen for 64 bit llvm.smax.
ltratt Feb 5, 2025
aa1570b
Implement codegen for llvm.ctpop.
ltratt Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ykrt/src/compile/jitc_yk/codegen/x64/lsregalloc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,9 +641,7 @@ impl LSRegAlloc<'_> {
{
self.move_gp_reg(asm, reg, old_reg);
} else {
// If we hit this case we probably need to swap
// registers. Can it happen?
todo!();
self.swap_gp_reg(asm, reg, old_reg);
}
changed = true;
}
Expand Down
147 changes: 143 additions & 4 deletions ykrt/src/compile/jitc_yk/codegen/x64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1614,10 +1614,25 @@ impl<'a> Assemble<'a> {
.map(|i| inst.operand(self.m, i))
.collect::<Vec<_>>();

// unwrap safe on account of linker symbol names not containing internal NULL bytes.
let va = symbol_to_ptr(self.m.func_decl(func_decl_idx).name())
.map_err(|e| CompilationError::General(e.to_string()))?;
self.emit_call(iidx, fty, Some(va), None, &args)
match self.m.func_decl(func_decl_idx).name() {
"llvm.assume" => Ok(()),
"llvm.lifetime.start.p0" => Ok(()),
"llvm.lifetime.end.p0" => Ok(()),
x if x.starts_with("llvm.ctpop") => {
let [op] = args.try_into().unwrap();
self.cg_ctpop(iidx, op);
Ok(())
}
x if x.starts_with("llvm.smax") => {
let [lhs_op, rhs_op] = args.try_into().unwrap();
self.cg_smax(iidx, lhs_op, rhs_op);
Ok(())
}
x => {
let va = symbol_to_ptr(x).map_err(|e| CompilationError::General(e.to_string()))?;
self.emit_call(iidx, fty, Some(va), None, &args)
}
}
}

/// Codegen a indirect call.
Expand Down Expand Up @@ -1785,6 +1800,61 @@ impl<'a> Assemble<'a> {
Ok(())
}

fn cg_ctpop(&mut self, iidx: InstIdx, op: Operand) {
let bitw = op.bitw(self.m);
let [in_reg, out_reg] = self.ra.assign_gp_regs(
&mut self.asm,
iidx,
[
GPConstraint::Input {
op: op.clone(),
in_ext: RegExtension::ZeroExtended,
force_reg: None,
clobber_reg: false,
},
GPConstraint::Output {
out_ext: RegExtension::ZeroExtended,
force_reg: None,
can_be_same_as_input: true,
},
],
);
assert!(bitw > 1 && bitw <= 64);
dynasm!(self.asm; popcnt Rq(out_reg.code()), Rq(in_reg.code()));
}

fn cg_smax(&mut self, iidx: InstIdx, lhs: Operand, rhs: Operand) {
assert_eq!(lhs.bitw(self.m), rhs.bitw(self.m));
let bitw = lhs.bitw(self.m);
let [lhs_reg, rhs_reg] = self.ra.assign_gp_regs(
&mut self.asm,
iidx,
[
GPConstraint::InputOutput {
op: lhs,
in_ext: RegExtension::SignExtended,
out_ext: RegExtension::SignExtended,
force_reg: None,
},
GPConstraint::Input {
op: rhs,
in_ext: RegExtension::SignExtended,
force_reg: None,
clobber_reg: false,
},
],
);
match bitw {
64 => {
dynasm!(self.asm
; cmp Rq(lhs_reg.code()), Rq(rhs_reg.code())
; cmovl Rq(lhs_reg.code()), Rq(rhs_reg.code())
);
}
x => todo!("{x}"),
}
}

/// Return the [VarLocation] an [Operand] relates to.
fn op_to_var_location(&self, op: Operand) -> VarLocation {
match op {
Expand Down Expand Up @@ -4015,6 +4085,75 @@ mod tests {
);
}

#[test]
fn cg_call_hints() {
codegen_and_test(
"
func_decl llvm.assume (i1)
func_decl llvm.lifetime.start.p0 (i64, ptr)
func_decl llvm.lifetime.end.p0 (i64, ptr)
entry:
%0: i1 = param 0
%1: ptr = param 1
call @llvm.assume(%0)
call @llvm.lifetime.start.p0(16i64, %1)
call @llvm.lifetime.end.p0(16i64, %1)
%5: ptr = ptr_add %1, 1
black_box %5
",
"
...
; call @llvm.assume(%0)
; call @llvm.lifetime.start.p0(16i64, %1)
; call @llvm.lifetime.end.p0(16i64, %1)
; %5: ...
...
",
false,
);
}

#[test]
fn cg_call_ctpop() {
codegen_and_test(
"
func_decl llvm.ctpop.i32 (i32) -> i32
entry:
%0: i32 = param 0
%1: i32 = call @llvm.ctpop.i32(%0)
black_box %1
",
"
...
; %1: i32 = call @llvm.ctpop.i32(%0)
mov r.32.a, r.32.a
popcnt r.64._, r.64.a
",
false,
);
}

#[test]
fn cg_call_smax() {
codegen_and_test(
"
func_decl llvm.smax.i64 (i64, i64) -> i64
entry:
%0: i64 = param 0
%1: i64 = param 1
%2: i64 = call @llvm.smax.i64(%0, %1)
black_box %2
",
"
...
; %2: i64 = call @llvm.smax.i64(%0, %1)
cmp r.64.a, r.64.b
cmovl r.64.a, r.64.b
",
false,
);
}

#[test]
fn cg_eq() {
codegen_and_test(
Expand Down
4 changes: 2 additions & 2 deletions ykrt/src/compile/jitc_yk/jit_ir/jit_ir.l
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%%
@[a-zA-Z_.][a-zA-Z_0-9]* "GLOBAL"
@[a-zA-Z_.][a-zA-Z_0-9.]* "GLOBAL"
%[0-9]+ "LOCAL_OPERAND"
i[0-9]+ "INT_TYPE"
float "FLOAT_TYPE"
Expand Down Expand Up @@ -80,7 +80,7 @@ f_true "F_TRUE"
urem "UREM"
xor "XOR"
[a-zA_Z_]+: "LABEL"
[a-zA_Z_][a-zA_Z_0-9]* "ID"
[a-zA_Z_][a-zA_Z_0-9.]* "ID"
volatile "VOLATILE"
\< "<"
\> ">"
Expand Down