RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 11:02:59 +02:00
Code Issues Projects Releases Wiki Activity

Cleanup the stackmap operand folding code and fix a corner case.

Browse Source 
I still don't know how to refer to the fixed operands symbolically. I
plan to look into it.

llvm-svn: 194529
This commit is contained in:
Andrew Trick 2013-11-12 22:58:39 +00:00
parent 619bbefc22
commit 12470267da
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Target/X86/X86InstrInfo.cpp
View File

@ -4206,12 +4206,18 @@ static MachineInstr* foldPatchpoint(MachineFunction &MF,
MF.CreateMachineInstr(TII.get(MI->getOpcode()), MI->getDebugLoc(), true);
MachineInstrBuilder MIB(MF, NewMI);
bool isPatchPoint = MI->getOpcode() == TargetOpcode::PATCHPOINT;
// For PatchPoint, the call args are not foldable.
unsigned NumCallArgs = MI->getOperand(StartIdx+3).getImm();
StartIdx = isPatchPoint ?
StartIdx + NumCallArgs + 5 :
StartIdx + 2;
switch (MI->getOpcode()) {
case TargetOpcode::STACKMAP:
StartIdx += 2; // Skip ID, nShadowBytes.
break;
case TargetOpcode::PATCHPOINT:
// Skip ID, numBytes, Target, numArgs.
// For PatchPoint, the call args are not foldable.
StartIdx += MI->getOperand(StartIdx+3).getImm() + 4;
break;
default:
llvm_unreachable("unexpected stackmap opcode");
}
// Return false if any operands requested for folding are not foldable (not
// part of the stackmap's live values).

22
test/CodeGen/X86/stackmap.ll
View File

@ -9,7 +9,7 @@
; CHECK-NEXT: .long 1
; CHECK-NEXT: .quad 4294967296
; Num Callsites
; CHECK-NEXT: .long 8
; CHECK-NEXT: .long 9
; Constant arguments
;
@ -195,6 +195,26 @@ entry:
ret void
}
; Spilled stack map values.
;
; Verify 17 stack map entries.
;
; CHECK: .long 12
; CHECK-LABEL: .long L{{.*}}-_spilledStackMapValue
; CHECK-NEXT: .short 0
; CHECK-NEXT: .short 17
;
; Check that at least one is a spilled entry from RBP.
; Location: Indirect RBP + ...
; CHECK: .byte 3
; CHECK: .byte 0
; CHECK: .short 6
define webkit_jscc void @spilledStackMapValue(i64 %l0, i64 %l1, i64 %l2, i64 %l3, i64 %l4, i64 %l5, i64 %l6, i64 %l7, i64 %l8, i64 %l9, i64 %l10, i64 %l11, i64 %l12, i64 %l13, i64 %l14, i64 %l15, i64 %l16) {
entry:
call void (i32, i32, ...)* @llvm.experimental.stackmap(i32 12, i32 15, i64 %l0, i64 %l1, i64 %l2, i64 %l3, i64 %l4, i64 %l5, i64 %l6, i64 %l7, i64 %l8, i64 %l9, i64 %l10, i64 %l11, i64 %l12, i64 %l13, i64 %l14, i64 %l15, i64 %l16)
ret void
}
declare void @llvm.experimental.stackmap(i32, i32, ...)
declare void @llvm.experimental.patchpoint.void(i32, i32, i8*, i32, ...)
declare i64 @llvm.experimental.patchpoint.i64(i32, i32, i8*, i32, ...)