Revert r194019 to r194021, "Submit the basic port of the rest of ARM constant islands code to Mips."

It broke -Asserts build.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194026 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
NAKAMURA Takumi 2013-11-04 23:14:36 +00:00
parent e53abc2072
commit 225f35a87c
3 changed files with 12 additions and 1563 deletions

View File

@ -60,11 +60,6 @@ class FRI16_ins<bits<5> op, string asmstr,
InstrItinClass itin>:
FRI16_ins_base<op, asmstr, "\t$rx, $imm \t# 16 bit inst", itin>;
class FRI16_TCP_ins<bits<5> _op, string asmstr,
InstrItinClass itin>:
FRI16<_op, (outs CPU16Regs:$rx), (ins pcrel16:$imm, i32imm:$size),
!strconcat(asmstr, "\t$rx, $imm\t# 16 bit inst"), [], itin>;
class FRI16R_ins_base<bits<5> op, string asmstr, string asmstr2,
InstrItinClass itin>:
FRI16<op, (outs), (ins CPU16Regs:$rx, simm16:$imm),
@ -179,7 +174,7 @@ class FEXT_RI16_B_ins<bits<5> _op, string asmstr,
class FEXT_RI16_TCP_ins<bits<5> _op, string asmstr,
InstrItinClass itin>:
FEXT_RI16<_op, (outs CPU16Regs:$rx), (ins pcrel16:$imm, i32imm:$size),
FEXT_RI16<_op, (outs CPU16Regs:$rx), (ins pcrel16:$imm),
!strconcat(asmstr, "\t$rx, $imm"), [], itin>;
class FEXT_2RI16_ins<bits<5> _op, string asmstr,
@ -807,8 +802,6 @@ def LwRxSpImmX16: FEXT_RI16_SP_explicit_ins<0b10010, "lw", IILoad>, MayLoad{
let Uses = [SP];
}
def LwRxPcTcp16: FRI16_TCP_ins<0b10110, "lw", IILoad>, MayLoad;
def LwRxPcTcpX16: FEXT_RI16_TCP_ins<0b10110, "lw", IILoad>, MayLoad;
//
// Format: MOVE r32, rz MIPS16e
@ -1876,4 +1869,3 @@ let neverHasSideEffects = 1, isNotDuplicable = 1 in
def CONSTPOOL_ENTRY :
MipsPseudo16<(outs), (ins cpinst_operand:$instid, cpinst_operand:$cpidx,
i32imm:$size), "foo", []>;

File diff suppressed because it is too large Load Diff

View File

@ -1,64 +0,0 @@
; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -soft-float -mips16-hard-float -relocation-model=static -mips16-constant-islands -mips-constant-islands-small-offset=20 < %s | FileCheck %s -check-prefix=offset20
; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -soft-float -mips16-hard-float -relocation-model=static -mips16-constant-islands -mips-constant-islands-small-offset=40 < %s | FileCheck %s -check-prefix=offset40
@i = common global i32 0, align 4
@b = common global i32 0, align 4
; Function Attrs: nounwind
define void @t() #0 {
entry:
store i32 -559023410, i32* @i, align 4
%0 = load i32* @b, align 4
%tobool = icmp ne i32 %0, 0
br i1 %tobool, label %if.then, label %if.else
; offset20: lw ${{[0-9]+}}, $CPI0_1 # 16 bit inst
; offset20: b $BB0_2
; offset20: .align 2
; offset20: $CPI0_0:
; offset20: .4byte 3735943886
; offset20: $BB0_2:
; offset40: beqz ${{[0-9]+}}, $BB0_3
; offset40: jal foo
; offset40: nop
; offset40: b $BB0_4
; offset40: .align 2
; offset40: $CPI0_0:
; offset40: .4byte 3735943886
; offset40: $BB0_3:
; offset40: jal goo
if.then: ; preds = %entry
call void bitcast (void (...)* @foo to void ()*)()
br label %if.end
if.else: ; preds = %entry
call void bitcast (void (...)* @goo to void ()*)()
br label %if.end
if.end: ; preds = %if.else, %if.then
call void bitcast (void (...)* @hoo to void ()*)()
call void bitcast (void (...)* @hoo to void ()*)()
call void bitcast (void (...)* @hoo to void ()*)()
call void bitcast (void (...)* @hoo to void ()*)()
call void bitcast (void (...)* @hoo to void ()*)()
call void bitcast (void (...)* @hoo to void ()*)()
call void bitcast (void (...)* @hoo to void ()*)()
call void bitcast (void (...)* @hoo to void ()*)()
ret void
}
declare void @foo(...) #1
declare void @goo(...) #1
declare void @hoo(...) #1
attributes #0 = { nounwind "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="true" }
attributes #1 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="true" }
!llvm.ident = !{!0}
!0 = metadata !{metadata !"clang version 3.4 (gitosis@dmz-portal.mips.com:clang.git 3a50d847e098f36e3bf8bc14eea07a6cc35f7803) (gitosis@dmz-portal.mips.com:llvm.git f52db0b69f0c888bdc98bb2f13aaecc1e83288a9)"}