From 0a227ad4d5e12ca90fd937bf2b05d8bca291a1ad Mon Sep 17 00:00:00 2001 From: Akira Hatanaka Date: Tue, 12 Nov 2013 21:03:57 +0000 Subject: [PATCH] [mips] Fix and re-enable a test case that has been disabled for a long time. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194510 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/Mips/MipsISelLowering.cpp | 2 +- test/CodeGen/Mips/o32_cc.ll | 219 +++++++++++++++------------ 2 files changed, 121 insertions(+), 100 deletions(-) diff --git a/lib/Target/Mips/MipsISelLowering.cpp b/lib/Target/Mips/MipsISelLowering.cpp index edba8747e97..1e8250c847f 100644 --- a/lib/Target/Mips/MipsISelLowering.cpp +++ b/lib/Target/Mips/MipsISelLowering.cpp @@ -2208,7 +2208,7 @@ static bool CC_MipsO32_FP32(unsigned ValNo, MVT ValVT, static bool CC_MipsO32_FP64(unsigned ValNo, MVT ValVT, MVT LocVT, CCValAssign::LocInfo LocInfo, ISD::ArgFlagsTy ArgFlags, CCState &State) { - static const uint16_t F64Regs[] = { Mips::D12_64, Mips::D12_64 }; + static const uint16_t F64Regs[] = { Mips::D12_64, Mips::D14_64 }; return CC_MipsO32(ValNo, ValVT, LocVT, LocInfo, ArgFlags, State, F64Regs); } diff --git a/test/CodeGen/Mips/o32_cc.ll b/test/CodeGen/Mips/o32_cc.ll index 70b66efee9a..8747bee86d7 100644 --- a/test/CodeGen/Mips/o32_cc.ll +++ b/test/CodeGen/Mips/o32_cc.ll @@ -1,11 +1,9 @@ -; RUN: llc -march=mips < %s | FileCheck %s - -; FIXME: Disabled because it unpredictably fails on certain platforms. -; REQUIRES: disabled +; RUN: llc -march=mipsel < %s | FileCheck %s ; $f12, $f14 -; CHECK: ldc1 $f12, %lo -; CHECK: ldc1 $f14, %lo +; CHECK-LABEL: testlowercall0: +; CHECK-DAG: ldc1 $f12, %lo +; CHECK-DAG: ldc1 $f14, %lo define void @testlowercall0() nounwind { entry: tail call void @f0(double 5.000000e+00, double 6.000000e+00) nounwind @@ -15,8 +13,9 @@ entry: declare void @f0(double, double) ; $f12, $f14 -; CHECK: lwc1 $f12, %lo -; CHECK: lwc1 $f14, %lo +; CHECK-LABEL: testlowercall1: +; CHECK-DAG: lwc1 $f12, %lo +; CHECK-DAG: lwc1 $f14, %lo define void @testlowercall1() nounwind { entry: tail call void @f1(float 8.000000e+00, float 9.000000e+00) nounwind @@ -26,8 +25,9 @@ entry: declare void @f1(float, float) ; $f12, $f14 -; CHECK: lwc1 $f12, %lo -; CHECK: ldc1 $f14, %lo +; CHECK-LABEL: testlowercall2: +; CHECK-DAG: lwc1 $f12, %lo +; CHECK-DAG: ldc1 $f14, %lo define void @testlowercall2() nounwind { entry: tail call void @f2(float 8.000000e+00, double 6.000000e+00) nounwind @@ -37,8 +37,9 @@ entry: declare void @f2(float, double) ; $f12, $f14 -; CHECK: ldc1 $f12, %lo -; CHECK: lwc1 $f14, %lo +; CHECK-LABEL: testlowercall3: +; CHECK-DAG: ldc1 $f12, %lo +; CHECK-DAG: lwc1 $f14, %lo define void @testlowercall3() nounwind { entry: tail call void @f3(double 5.000000e+00, float 9.000000e+00) nounwind @@ -48,10 +49,11 @@ entry: declare void @f3(double, float) ; $4, $5, $6, $7 -; CHECK: addiu $4, $zero, 12 -; CHECK: addiu $5, $zero, 13 -; CHECK: addiu $6, $zero, 14 -; CHECK: addiu $7, $zero, 15 +; CHECK-LABEL: testlowercall4: +; CHECK-DAG: addiu $4, $zero, 12 +; CHECK-DAG: addiu $5, $zero, 13 +; CHECK-DAG: addiu $6, $zero, 14 +; CHECK-DAG: addiu $7, $zero, 15 define void @testlowercall4() nounwind { entry: tail call void @f4(i32 12, i32 13, i32 14, i32 15) nounwind @@ -61,10 +63,11 @@ entry: declare void @f4(i32, i32, i32, i32) ; $f12, $6, stack -; CHECK: sw -; CHECK: sw -; CHECK: ldc1 $f12, %lo -; CHECK: addiu $6, $zero, 23 +; CHECK-LABEL: testlowercall5: +; CHECK-DAG: ldc1 $f12, %lo +; CHECK-DAG: addiu $6, $zero, 23 +; CHECK-DAG: sw ${{[a-z0-9]+}}, 16($sp) +; CHECK-DAG: sw ${{[a-z0-9]+}}, 20($sp) define void @testlowercall5() nounwind { entry: tail call void @f5(double 1.500000e+01, i32 23, double 1.700000e+01) nounwind @@ -74,9 +77,10 @@ entry: declare void @f5(double, i32, double) ; $f12, $6, $7 -; CHECK: ldc1 $f12, %lo -; CHECK: addiu $6, $zero, 33 -; CHECK: addiu $7, $zero, 24 +; CHECK-LABEL: testlowercall6: +; CHECK-DAG: ldc1 $f12, %lo +; CHECK-DAG: addiu $6, $zero, 33 +; CHECK-DAG: addiu $7, $zero, 24 define void @testlowercall6() nounwind { entry: tail call void @f6(double 2.500000e+01, i32 33, i32 24) nounwind @@ -86,9 +90,10 @@ entry: declare void @f6(double, i32, i32) ; $f12, $5, $6 -; CHECK: lwc1 $f12, %lo -; CHECK: addiu $5, $zero, 43 -; CHECK: addiu $6, $zero, 34 +; CHECK-LABEL: testlowercall7: +; CHECK-DAG: lwc1 $f12, %lo +; CHECK-DAG: addiu $5, $zero, 43 +; CHECK-DAG: addiu $6, $zero, 34 define void @testlowercall7() nounwind { entry: tail call void @f7(float 1.800000e+01, i32 43, i32 34) nounwind @@ -98,11 +103,12 @@ entry: declare void @f7(float, i32, i32) ; $4, $5, $6, stack -; CHECK: sw -; CHECK: sw -; CHECK: addiu $4, $zero, 22 -; CHECK: addiu $5, $zero, 53 -; CHECK: addiu $6, $zero, 44 +; CHECK-LABEL: testlowercall8: +; CHECK-DAG: addiu $4, $zero, 22 +; CHECK-DAG: addiu $5, $zero, 53 +; CHECK-DAG: addiu $6, $zero, 44 +; CHECK-DAG: sw ${{[a-z0-9]+}}, 16($sp) +; CHECK-DAG: sw ${{[a-z0-9]+}}, 20($sp) define void @testlowercall8() nounwind { entry: tail call void @f8(i32 22, i32 53, i32 44, double 4.000000e+00) nounwind @@ -112,10 +118,11 @@ entry: declare void @f8(i32, i32, i32, double) ; $4, $5, $6, $7 -; CHECK: addiu $4, $zero, 32 -; CHECK: addiu $5, $zero, 63 -; CHECK: addiu $6, $zero, 54 -; CHECK: ori $7 +; CHECK-LABEL: testlowercall9: +; CHECK-DAG: addiu $4, $zero, 32 +; CHECK-DAG: addiu $5, $zero, 63 +; CHECK-DAG: addiu $6, $zero, 54 +; CHECK-DAG: lui $7, 16688 define void @testlowercall9() nounwind { entry: tail call void @f9(i32 32, i32 63, i32 54, float 1.100000e+01) nounwind @@ -125,10 +132,11 @@ entry: declare void @f9(i32, i32, i32, float) ; $4, $5, ($6, $7) -; CHECK: addiu $4, $zero, 42 -; CHECK: addiu $5, $zero, 73 -; CHECK: addiu $6, $zero, 0 -; CHECK: ori $7 +; CHECK-LABEL: testlowercall10: +; CHECK-DAG: addiu $4, $zero, 42 +; CHECK-DAG: addiu $5, $zero, 73 +; CHECK-DAG: mfc1 $6, $f{{[0-9]+}} +; CHECK-DAG: mfc1 $7, $f{{[0-9]+}} define void @testlowercall10() nounwind { entry: tail call void @f10(i32 42, i32 73, double 2.700000e+01) nounwind @@ -138,9 +146,10 @@ entry: declare void @f10(i32, i32, double) ; $4, ($6, $7) -; CHECK: addiu $4, $zero, 52 -; CHECK: addiu $6, $zero, 0 -; CHECK: ori $7 +; CHECK-LABEL: testlowercall11: +; CHECK-DAG: addiu $4, $zero, 52 +; CHECK-DAG: mfc1 $6, $f{{[0-9]+}} +; CHECK-DAG: mfc1 $7, $f{{[0-9]+}} define void @testlowercall11() nounwind { entry: tail call void @f11(i32 52, double 1.600000e+01) nounwind @@ -150,10 +159,11 @@ entry: declare void @f11(i32, double) ; $f12, $f14, $6, $7 -; CHECK: lwc1 $f12, %lo -; CHECK: lwc1 $f14, %lo -; CHECK: ori $6 -; CHECK: ori $7 +; CHECK-LABEL: testlowercall12: +; CHECK-DAG: lwc1 $f12, %lo +; CHECK-DAG: lwc1 $f14, %lo +; CHECK-DAG: lui $6, 16672 +; CHECK-DAG: lui $7, 16808 define void @testlowercall12() nounwind { entry: tail call void @f12(float 2.800000e+01, float 1.900000e+01, float 1.000000e+01, float 2.100000e+01) nounwind @@ -163,10 +173,11 @@ entry: declare void @f12(float, float, float, float) ; $f12, $5, $6, $7 -; CHECK: lwc1 $f12, %lo -; CHECK: addiu $5, $zero, 83 -; CHECK: ori $6 -; CHECK: addiu $7, $zero, 25 +; CHECK-LABEL: testlowercall13: +; CHECK-DAG: lwc1 $f12, %lo +; CHECK-DAG: addiu $5, $zero, 83 +; CHECK-DAG: lui $6, 16800 +; CHECK-DAG: addiu $7, $zero, 25 define void @testlowercall13() nounwind { entry: tail call void @f13(float 3.800000e+01, i32 83, float 2.000000e+01, i32 25) nounwind @@ -177,9 +188,10 @@ entry: declare void @f13(float, i32, float, i32) ; $f12, $f14, $7 -; CHECK: ldc1 $f12, %lo -; CHECK: lwc1 $f14, %lo -; CHECK: ori $7 +; CHECK-LABEL: testlowercall14: +; CHECK-DAG: ldc1 $f12, %lo +; CHECK-DAG: lwc1 $f14, %lo +; CHECK-DAG: lui $7, 16880 define void @testlowercall14() nounwind { entry: tail call void @f14(double 3.500000e+01, float 2.900000e+01, float 3.000000e+01) nounwind @@ -189,10 +201,11 @@ entry: declare void @f14(double, float, float) ; $f12, $f14, ($6, $7) -; CHECK: lwc1 $f12, %lo -; CHECK: lwc1 $f14, %lo -; CHECK: addiu $6, $zero, 0 -; CHECK: ori $7 +; CHECK-LABEL: testlowercall15: +; CHECK-DAG: lwc1 $f12, %lo +; CHECK-DAG: lwc1 $f14, %lo +; CHECK-DAG: mfc1 $6, $f{{[0-9]+}} +; CHECK-DAG: mfc1 $7, $f{{[0-9]+}} define void @testlowercall15() nounwind { entry: tail call void @f15(float 4.800000e+01, float 3.900000e+01, double 3.700000e+01) nounwind @@ -202,10 +215,11 @@ entry: declare void @f15(float, float, double) ; $4, $5, $6, $7 -; CHECK: addiu $4, $zero, 62 -; CHECK: ori $5 -; CHECK: addiu $6, $zero, 64 -; CHECK: ori $7 +; CHECK-LABEL: testlowercall16: +; CHECK-DAG: addiu $4, $zero, 62 +; CHECK-DAG: lui $5, 16964 +; CHECK-DAG: addiu $6, $zero, 64 +; CHECK-DAG: lui $7, 16888 define void @testlowercall16() nounwind { entry: tail call void @f16(i32 62, float 4.900000e+01, i32 64, float 3.100000e+01) nounwind @@ -215,10 +229,11 @@ entry: declare void @f16(i32, float, i32, float) ; $4, $5, $6, $7 -; CHECK: addiu $4, $zero, 72 -; CHECK: ori $5 -; CHECK: addiu $6, $zero, 74 -; CHECK: addiu $7, $zero, 35 +; CHECK-LABEL: testlowercall17: +; CHECK-DAG: addiu $4, $zero, 72 +; CHECK-DAG: lui $5, 17004 +; CHECK-DAG: addiu $6, $zero, 74 +; CHECK-DAG: addiu $7, $zero, 35 define void @testlowercall17() nounwind { entry: tail call void @f17(i32 72, float 5.900000e+01, i32 74, i32 35) nounwind @@ -228,10 +243,11 @@ entry: declare void @f17(i32, float, i32, i32) ; $4, $5, $6, $7 -; CHECK: addiu $4, $zero, 82 -; CHECK: addiu $5, $zero, 93 -; CHECK: ori $6 -; CHECK: addiu $7, $zero, 45 +; CHECK-LABEL: testlowercall18: +; CHECK-DAG: addiu $4, $zero, 82 +; CHECK-DAG: addiu $5, $zero, 93 +; CHECK-DAG: lui $6, 16928 +; CHECK-DAG: addiu $7, $zero, 45 define void @testlowercall18() nounwind { entry: tail call void @f18(i32 82, i32 93, float 4.000000e+01, i32 45) nounwind @@ -242,11 +258,12 @@ declare void @f18(i32, i32, float, i32) ; $4, ($6, $7), stack -; CHECK: sw -; CHECK: sw -; CHECK: addiu $4, $zero, 92 -; CHECK: addiu $6, $zero, 0 -; CHECK: ori $7 +; CHECK-LABEL: testlowercall20: +; CHECK-DAG: addiu $4, $zero, 92 +; CHECK-DAG: mfc1 $6, $f{{[0-9]+}} +; CHECK-DAG: mfc1 $7, $f{{[0-9]+}} +; CHECK-DAG: sw ${{[a-z0-9]+}}, 16($sp) +; CHECK-DAG: sw ${{[a-z0-9]+}}, 20($sp) define void @testlowercall20() nounwind { entry: tail call void @f20(i32 92, double 2.600000e+01, double 4.700000e+01) nounwind @@ -256,8 +273,9 @@ entry: declare void @f20(i32, double, double) ; $f12, $5 -; CHECK: lwc1 $f12, %lo -; CHECK: addiu $5, $zero, 103 +; CHECK-LABEL: testlowercall21: +; CHECK-DAG: lwc1 $f12, %lo +; CHECK-DAG: addiu $5, $zero, 103 define void @testlowercall21() nounwind { entry: tail call void @f21(float 5.800000e+01, i32 103) nounwind @@ -267,10 +285,11 @@ entry: declare void @f21(float, i32) ; $f12, $5, ($6, $7) -; CHECK: lwc1 $f12, %lo -; CHECK: addiu $5, $zero, 113 -; CHECK: addiu $6, $zero, 0 -; CHECK: ori $7 +; CHECK-LABEL: testlowercall22: +; CHECK-DAG: lwc1 $f12, %lo +; CHECK-DAG: addiu $5, $zero, 113 +; CHECK-DAG: mfc1 $6, $f{{[0-9]+}} +; CHECK-DAG: mfc1 $7, $f{{[0-9]+}} define void @testlowercall22() nounwind { entry: tail call void @f22(float 6.800000e+01, i32 113, double 5.700000e+01) nounwind @@ -280,8 +299,9 @@ entry: declare void @f22(float, i32, double) ; $f12, f6 -; CHECK: ldc1 $f12, %lo -; CHECK: addiu $6, $zero, 123 +; CHECK-LABEL: testlowercall23: +; CHECK-DAG: ldc1 $f12, %lo +; CHECK-DAG: addiu $6, $zero, 123 define void @testlowercall23() nounwind { entry: tail call void @f23(double 4.500000e+01, i32 123) nounwind @@ -291,10 +311,11 @@ entry: declare void @f23(double, i32) ; $f12,$6, stack -; CHECK: sw -; CHECK: sw -; CHECK: ldc1 $f12, %lo -; CHECK: addiu $6, $zero, 133 +; CHECK-LABEL: testlowercall24: +; CHECK-DAG: ldc1 $f12, %lo +; CHECK-DAG: addiu $6, $zero, 133 +; CHECK-DAG: sw ${{[a-z0-9]+}}, 16($sp) +; CHECK-DAG: sw ${{[a-z0-9]+}}, 20($sp) define void @testlowercall24() nounwind { entry: tail call void @f24(double 5.500000e+01, i32 133, double 6.700000e+01) nounwind @@ -303,19 +324,19 @@ entry: declare void @f24(double, i32, double) -; CHECK: lwc1 $f12, %lo -; lwc1 $f12, %lo -; CHECK: lwc1 $f14, %lo -; CHECK: ori $6 -; CHECK: ori $7 -; CHECK: lwc1 $f12, %lo -; CHECK: addiu $5, $zero, 83 -; CHECK: ori $6 -; CHECK: addiu $7, $zero, 25 -; CHECK: addiu $4, $zero, 82 -; CHECK: addiu $5, $zero, 93 -; CHECK: ori $6 -; CHECK: addiu $7, $zero, 45 +; CHECK-LABEL: testlowercall25: +; CHECK-DAG: lwc1 $f12, %lo +; CHECK-DAG: lwc1 $f14, %lo +; CHECK-DAG: lui $6 +; CHECK-DAG: lui $7 +; CHECK-DAG: lwc1 $f12, %lo +; CHECK-DAG: addiu $5, $zero, 83 +; CHECK-DAG: lui $6 +; CHECK-DAG: addiu $7, $zero, 25 +; CHECK-DAG: addiu $4, $zero, 82 +; CHECK-DAG: addiu $5, $zero, 93 +; CHECK-DAG: lui $6 +; CHECK-DAG: addiu $7, $zero, 45 define void @testlowercall25() nounwind { entry: tail call void @f12(float 2.800000e+01, float 1.900000e+01, float 1.000000e+01, float 2.100000e+01) nounwind