6502/llvm-6502
1
0 Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2026-04-27 04:18:42 +00:00
Code Issues Projects Releases Wiki Activity

Merging r236099:

Browse Source 
------------------------------------------------------------------------
r236099 | dsanders | 2015-04-29 13:28:58 +0100 (Wed, 29 Apr 2015) | 13 lines

[mips] Correct 128-bit shifts on 64-bit targets.

Summary:
The existing code was correct for 32-bit GPR's but not 64-bit GPR's. It now
accounts for both cases.

Reviewers: vkalintiris

Reviewed By: vkalintiris

Subscribers: llvm-commits, mohit.bhakkad, sagar

Differential Revision: http://reviews.llvm.org/D9337
------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_36@236215 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Sanders committed 2015-04-30 09:21:49 +00:00
1 parent bff4c86723
commit d6409a29e3
4 files changed
+17 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/Target/Mips/MipsISelLowering.cpp
+5 -4
View File
@@ -2069,7 +2069,7 @@ SDValue MipsTargetLowering::lowerShiftLeftParts(SDValue Op,
SDValue Or = DAG.getNode(ISD::OR, DL, VT, ShiftLeftHi, ShiftRightLo); SDValue Or = DAG.getNode(ISD::OR, DL, VT, ShiftLeftHi, ShiftRightLo);
SDValue ShiftLeftLo = DAG.getNode(ISD::SHL, DL, VT, Lo, Shamt); SDValue ShiftLeftLo = DAG.getNode(ISD::SHL, DL, VT, Lo, Shamt);
SDValue Cond = DAG.getNode(ISD::AND, DL, MVT::i32, Shamt, SDValue Cond = DAG.getNode(ISD::AND, DL, MVT::i32, Shamt,
DAG.getConstant(0x20, MVT::i32)); DAG.getConstant(VT.getSizeInBits(), MVT::i32));
Lo = DAG.getNode(ISD::SELECT, DL, VT, Cond, Lo = DAG.getNode(ISD::SELECT, DL, VT, Cond,
DAG.getConstant(0, VT), ShiftLeftLo); DAG.getConstant(0, VT), ShiftLeftLo);
Hi = DAG.getNode(ISD::SELECT, DL, VT, Cond, ShiftLeftLo, Or); Hi = DAG.getNode(ISD::SELECT, DL, VT, Cond, ShiftLeftLo, Or);
@@ -2108,11 +2108,12 @@ SDValue MipsTargetLowering::lowerShiftRightParts(SDValue Op, SelectionDAG &DAG,
SDValue ShiftRightHi = DAG.getNode(IsSRA ? ISD::SRA : ISD::SRL, SDValue ShiftRightHi = DAG.getNode(IsSRA ? ISD::SRA : ISD::SRL,
DL, VT, Hi, Shamt); DL, VT, Hi, Shamt);
SDValue Cond = DAG.getNode(ISD::AND, DL, MVT::i32, Shamt, SDValue Cond = DAG.getNode(ISD::AND, DL, MVT::i32, Shamt,
DAG.getConstant(0x20, MVT::i32)); DAG.getConstant(VT.getSizeInBits(), MVT::i32));
SDValue Shift31 = DAG.getNode(ISD::SRA, DL, VT, Hi, DAG.getConstant(31, VT)); SDValue Ext = DAG.getNode(ISD::SRA, DL, VT, Hi,
DAG.getConstant(VT.getSizeInBits() - 1, VT));
Lo = DAG.getNode(ISD::SELECT, DL, VT, Cond, ShiftRightHi, Or); Lo = DAG.getNode(ISD::SELECT, DL, VT, Cond, ShiftRightHi, Or);
Hi = DAG.getNode(ISD::SELECT, DL, VT, Cond, Hi = DAG.getNode(ISD::SELECT, DL, VT, Cond,
IsSRA ? Shift31 : DAG.getConstant(0, VT), ShiftRightHi); IsSRA ? Ext : DAG.getConstant(0, VT), ShiftRightHi);
SDValue Ops[2] = {Lo, Hi}; SDValue Ops[2] = {Lo, Hi};
return DAG.getMergeValues(Ops, DL); return DAG.getMergeValues(Ops, DL);
test/CodeGen/Mips/llvm-ir/ashr.ll
+6 -6
View File
@@ -135,7 +135,7 @@ entry:
; M3: sll $[[T0:[0-9]+]], $7, 0 ; M3: sll $[[T0:[0-9]+]], $7, 0
; M3: dsrav $[[T1:[0-9]+]], $4, $[[T0]] ; M3: dsrav $[[T1:[0-9]+]], $4, $[[T0]]
; M3: andi $[[T2:[0-9]+]], $[[T0]], 32 ; M3: andi $[[T2:[0-9]+]], $[[T0]], 64
; M3: bnez $[[T3:[0-9]+]], $[[BB0:BB[0-9_]+]] ; M3: bnez $[[T3:[0-9]+]], $[[BB0:BB[0-9_]+]]
; M3: move $3, $[[T1]] ; M3: move $3, $[[T1]]
; M3: dsrlv $[[T4:[0-9]+]], $5, $[[T0]] ; M3: dsrlv $[[T4:[0-9]+]], $5, $[[T0]]
@@ -146,7 +146,7 @@ entry:
; M3: $[[BB0]]: ; M3: $[[BB0]]:
; M3: beqz $[[T3]], $[[BB1:BB[0-9_]+]] ; M3: beqz $[[T3]], $[[BB1:BB[0-9_]+]]
; M3: nop ; M3: nop
; M3: dsra $2, $4, 31 ; M3: dsra $2, $4, 63
; M3: $[[BB1]]: ; M3: $[[BB1]]:
; M3: jr $ra ; M3: jr $ra
; M3: nop ; M3: nop
@@ -158,19 +158,19 @@ entry:
; GP64-NOT-R6: dsllv $[[T4:[0-9]+]], $[[T2]], $[[T3]] ; GP64-NOT-R6: dsllv $[[T4:[0-9]+]], $[[T2]], $[[T3]]
; GP64-NOT-R6: or $3, $[[T4]], $[[T1]] ; GP64-NOT-R6: or $3, $[[T4]], $[[T1]]
; GP64-NOT-R6: dsrav $2, $4, $[[T0]] ; GP64-NOT-R6: dsrav $2, $4, $[[T0]]
; GP64-NOT-R6: andi $[[T5:[0-9]+]], $[[T0]], 32 ; GP64-NOT-R6: andi $[[T5:[0-9]+]], $[[T0]], 64
; GP64-NOT-R6: movn $3, $2, $[[T5]] ; GP64-NOT-R6: movn $3, $2, $[[T5]]
; GP64-NOT-R6: dsra $[[T6:[0-9]+]], $4, 31 ; GP64-NOT-R6: dsra $[[T6:[0-9]+]], $4, 63
; GP64-NOT-R6: jr $ra ; GP64-NOT-R6: jr $ra
; GP64-NOT-R6: movn $2, $[[T6]], $[[T5]] ; GP64-NOT-R6: movn $2, $[[T6]], $[[T5]]
; 64R6: sll $[[T0:[0-9]+]], $7, 0 ; 64R6: sll $[[T0:[0-9]+]], $7, 0
; 64R6: dsrav $[[T1:[0-9]+]], $4, $[[T0]] ; 64R6: dsrav $[[T1:[0-9]+]], $4, $[[T0]]
; 64R6: andi $[[T2:[0-9]+]], $[[T0]], 32 ; 64R6: andi $[[T2:[0-9]+]], $[[T0]], 64
; 64R6: sll $[[T3:[0-9]+]], $[[T2]], 0 ; 64R6: sll $[[T3:[0-9]+]], $[[T2]], 0
; 64R6: seleqz $[[T4:[0-9]+]], $[[T1]], $[[T3]] ; 64R6: seleqz $[[T4:[0-9]+]], $[[T1]], $[[T3]]
; 64R6: dsra $[[T5:[0-9]+]], $4, 31 ; 64R6: dsra $[[T5:[0-9]+]], $4, 63
; 64R6: selnez $[[T6:[0-9]+]], $[[T5]], $[[T3]] ; 64R6: selnez $[[T6:[0-9]+]], $[[T5]], $[[T3]]
; 64R6: or $2, $[[T6]], $[[T4]] ; 64R6: or $2, $[[T6]], $[[T4]]
; 64R6: dsrlv $[[T7:[0-9]+]], $5, $[[T0]] ; 64R6: dsrlv $[[T7:[0-9]+]], $5, $[[T0]]
test/CodeGen/Mips/llvm-ir/lshr.ll
+3 -3
View File
@@ -128,7 +128,7 @@ entry:
; M3: sll $[[T0:[0-9]+]], $7, 0 ; M3: sll $[[T0:[0-9]+]], $7, 0
; M3: dsrlv $[[T1:[0-9]+]], $4, $[[T0]] ; M3: dsrlv $[[T1:[0-9]+]], $4, $[[T0]]
; M3: andi $[[T2:[0-9]+]], $[[T0]], 32 ; M3: andi $[[T2:[0-9]+]], $[[T0]], 64
; M3: bnez $[[T3:[0-9]+]], $[[BB0:BB[0-9_]+]] ; M3: bnez $[[T3:[0-9]+]], $[[BB0:BB[0-9_]+]]
; M3: move $3, $[[T1]] ; M3: move $3, $[[T1]]
; M3: dsrlv $[[T4:[0-9]+]], $5, $[[T0]] ; M3: dsrlv $[[T4:[0-9]+]], $5, $[[T0]]
@@ -151,7 +151,7 @@ entry:
; GP64-NOT-R6: dsllv $[[T4:[0-9]+]], $[[T2]], $[[T3]] ; GP64-NOT-R6: dsllv $[[T4:[0-9]+]], $[[T2]], $[[T3]]
; GP64-NOT-R6: or $3, $[[T4]], $[[T1]] ; GP64-NOT-R6: or $3, $[[T4]], $[[T1]]
; GP64-NOT-R6: dsrlv $2, $4, $[[T0]] ; GP64-NOT-R6: dsrlv $2, $4, $[[T0]]
; GP64-NOT-R6: andi $[[T5:[0-9]+]], $[[T0]], 32 ; GP64-NOT-R6: andi $[[T5:[0-9]+]], $[[T0]], 64
; GP64-NOT-R6: movn $3, $2, $[[T5]] ; GP64-NOT-R6: movn $3, $2, $[[T5]]
; GP64-NOT-R6: jr $ra ; GP64-NOT-R6: jr $ra
; GP64-NOT-R6: movn $2, $zero, $1 ; GP64-NOT-R6: movn $2, $zero, $1
@@ -162,7 +162,7 @@ entry:
; 64R6: not $[[T3:[0-9]+]], $[[T0]] ; 64R6: not $[[T3:[0-9]+]], $[[T0]]
; 64R6: dsllv $[[T4:[0-9]+]], $[[T2]], $[[T3]] ; 64R6: dsllv $[[T4:[0-9]+]], $[[T2]], $[[T3]]
; 64R6: or $[[T5:[0-9]+]], $[[T4]], $[[T1]] ; 64R6: or $[[T5:[0-9]+]], $[[T4]], $[[T1]]
; 64R6: andi $[[T6:[0-9]+]], $[[T0]], 32 ; 64R6: andi $[[T6:[0-9]+]], $[[T0]], 64
; 64R6: sll $[[T7:[0-9]+]], $[[T6]], 0 ; 64R6: sll $[[T7:[0-9]+]], $[[T6]], 0
; 64R6: seleqz $[[T8:[0-9]+]], $[[T5]], $[[T7]] ; 64R6: seleqz $[[T8:[0-9]+]], $[[T5]], $[[T7]]
; 64R6: dsrlv $[[T9:[0-9]+]], $4, $[[T0]] ; 64R6: dsrlv $[[T9:[0-9]+]], $4, $[[T0]]
test/CodeGen/Mips/llvm-ir/shl.ll
+3 -3
View File
@@ -140,7 +140,7 @@ entry:
; M3: sll $[[T0:[0-9]+]], $7, 0 ; M3: sll $[[T0:[0-9]+]], $7, 0
; M3: dsllv $[[T1:[0-9]+]], $5, $[[T0]] ; M3: dsllv $[[T1:[0-9]+]], $5, $[[T0]]
; M3: andi $[[T2:[0-9]+]], $[[T0]], 32 ; M3: andi $[[T2:[0-9]+]], $[[T0]], 64
; M3: bnez $[[T3:[0-9]+]], $[[BB0:BB[0-9_]+]] ; M3: bnez $[[T3:[0-9]+]], $[[BB0:BB[0-9_]+]]
; M3: move $2, $[[T1]] ; M3: move $2, $[[T1]]
; M3: dsllv $[[T4:[0-9]+]], $4, $[[T0]] ; M3: dsllv $[[T4:[0-9]+]], $4, $[[T0]]
@@ -163,7 +163,7 @@ entry:
; GP64-NOT-R6: dsrlv $[[T4:[0-9]+]], $[[T2]], $[[T3]] ; GP64-NOT-R6: dsrlv $[[T4:[0-9]+]], $[[T2]], $[[T3]]
; GP64-NOT-R6: or $2, $[[T1]], $[[T4]] ; GP64-NOT-R6: or $2, $[[T1]], $[[T4]]
; GP64-NOT-R6: dsllv $3, $5, $[[T0]] ; GP64-NOT-R6: dsllv $3, $5, $[[T0]]
; GP64-NOT-R6: andi $[[T5:[0-9]+]], $[[T0]], 32 ; GP64-NOT-R6: andi $[[T5:[0-9]+]], $[[T0]], 64
; GP64-NOT-R6: movn $2, $3, $[[T5]] ; GP64-NOT-R6: movn $2, $3, $[[T5]]
; GP64-NOT-R6: jr $ra ; GP64-NOT-R6: jr $ra
; GP64-NOT-R6: movn $3, $zero, $1 ; GP64-NOT-R6: movn $3, $zero, $1
@@ -174,7 +174,7 @@ entry:
; 64R6: not $[[T3:[0-9]+]], $[[T0]] ; 64R6: not $[[T3:[0-9]+]], $[[T0]]
; 64R6: dsrlv $[[T4:[0-9]+]], $[[T2]], $[[T3]] ; 64R6: dsrlv $[[T4:[0-9]+]], $[[T2]], $[[T3]]
; 64R6: or $[[T5:[0-9]+]], $[[T1]], $[[T4]] ; 64R6: or $[[T5:[0-9]+]], $[[T1]], $[[T4]]
; 64R6: andi $[[T6:[0-9]+]], $[[T0]], 32 ; 64R6: andi $[[T6:[0-9]+]], $[[T0]], 64
; 64R6: sll $[[T7:[0-9]+]], $[[T6]], 0 ; 64R6: sll $[[T7:[0-9]+]], $[[T6]], 0
; 64R6: seleqz $[[T8:[0-9]+]], $[[T5]], $[[T7]] ; 64R6: seleqz $[[T8:[0-9]+]], $[[T5]], $[[T7]]
; 64R6: dsllv $[[T9:[0-9]+]], $5, $[[T0]] ; 64R6: dsllv $[[T9:[0-9]+]], $5, $[[T0]]