From 4055cfc46a5beb13d0daeace53ac3fe56a1f4ad1 Mon Sep 17 00:00:00 2001 From: Akira Hatanaka Date: Thu, 24 Jan 2013 21:47:33 +0000 Subject: [PATCH] [mips] Do not emit i32 padding if target ABI is O32. This was causing backend to pass floating point arguments to be passed in integer registers. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173375 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/TargetInfo.cpp | 3 ++- test/CodeGen/mips64-padding-arg.c | 32 +++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp index 6803853578..a2e575d3f0 100644 --- a/lib/CodeGen/TargetInfo.cpp +++ b/lib/CodeGen/TargetInfo.cpp @@ -4022,7 +4022,8 @@ MipsABIInfo::classifyArgumentType(QualType Ty, uint64_t &Offset) const { if (Ty->isPromotableIntegerType()) return ABIArgInfo::getExtend(); - return ABIArgInfo::getDirect(0, 0, getPaddingType(Align, OrigOffset)); + return ABIArgInfo::getDirect(0, 0, + IsO32 ? 0 : getPaddingType(Align, OrigOffset)); } llvm::Type* diff --git a/test/CodeGen/mips64-padding-arg.c b/test/CodeGen/mips64-padding-arg.c index 9d7f8774f6..85dc00c905 100644 --- a/test/CodeGen/mips64-padding-arg.c +++ b/test/CodeGen/mips64-padding-arg.c @@ -1,4 +1,5 @@ -// RUN: %clang -target mips64el-unknown-linux -O3 -S -mabi=n64 -o - -emit-llvm %s | FileCheck %s +// RUN: %clang -target mipsel-unknown-linux -O3 -S -o - -emit-llvm %s | FileCheck %s -check-prefix=O32 +// RUN: %clang -target mips64el-unknown-linux -O3 -S -mabi=n64 -o - -emit-llvm %s | FileCheck %s -check-prefix=N64 typedef struct { double d; @@ -7,9 +8,9 @@ typedef struct { // Insert padding to ensure arguments of type S0 are aligned to 16-byte boundaries. -// CHECK: define void @foo1(i32 %a0, i64, double %a1.coerce0, i64 %a1.coerce1, i64 %a1.coerce2, i64 %a1.coerce3, double %a2.coerce0, i64 %a2.coerce1, i64 %a2.coerce2, i64 %a2.coerce3, i32 %b, i64, double %a3.coerce0, i64 %a3.coerce1, i64 %a3.coerce2, i64 %a3.coerce3) -// CHECK: tail call void @foo2(i32 1, i32 2, i32 %a0, i64 undef, double %a1.coerce0, i64 %a1.coerce1, i64 %a1.coerce2, i64 %a1.coerce3, double %a2.coerce0, i64 %a2.coerce1, i64 %a2.coerce2, i64 %a2.coerce3, i32 3, i64 undef, double %a3.coerce0, i64 %a3.coerce1, i64 %a3.coerce2, i64 %a3.coerce3) -// CHECK: declare void @foo2(i32, i32, i32, i64, double, i64, i64, i64, double, i64, i64, i64, i32, i64, double, i64, i64, i64) +// N64: define void @foo1(i32 %a0, i64, double %a1.coerce0, i64 %a1.coerce1, i64 %a1.coerce2, i64 %a1.coerce3, double %a2.coerce0, i64 %a2.coerce1, i64 %a2.coerce2, i64 %a2.coerce3, i32 %b, i64, double %a3.coerce0, i64 %a3.coerce1, i64 %a3.coerce2, i64 %a3.coerce3) +// N64: tail call void @foo2(i32 1, i32 2, i32 %a0, i64 undef, double %a1.coerce0, i64 %a1.coerce1, i64 %a1.coerce2, i64 %a1.coerce3, double %a2.coerce0, i64 %a2.coerce1, i64 %a2.coerce2, i64 %a2.coerce3, i32 3, i64 undef, double %a3.coerce0, i64 %a3.coerce1, i64 %a3.coerce2, i64 %a3.coerce3) +// N64: declare void @foo2(i32, i32, i32, i64, double, i64, i64, i64, double, i64, i64, i64, i32, i64, double, i64, i64, i64) extern void foo2(int, int, int, S0, S0, int, S0); @@ -19,9 +20,9 @@ void foo1(int a0, S0 a1, S0 a2, int b, S0 a3) { // Insert padding before long double argument. // -// CHECK: define void @foo3(i32 %a0, i64, fp128 %a1) -// CHECK: tail call void @foo4(i32 1, i32 2, i32 %a0, i64 undef, fp128 %a1) -// CHECK: declare void @foo4(i32, i32, i32, i64, fp128) +// N64: define void @foo3(i32 %a0, i64, fp128 %a1) +// N64: tail call void @foo4(i32 1, i32 2, i32 %a0, i64 undef, fp128 %a1) +// N64: declare void @foo4(i32, i32, i32, i64, fp128) extern void foo4(int, int, int, long double); @@ -31,9 +32,9 @@ void foo3(int a0, long double a1) { // Insert padding after hidden argument. // -// CHECK: define void @foo5(%struct.S0* noalias sret %agg.result, i64, fp128 %a0) -// CHECK: call void @foo6(%struct.S0* sret %agg.result, i32 1, i32 2, i64 undef, fp128 %a0) -// CHECK: declare void @foo6(%struct.S0* sret, i32, i32, i64, fp128) +// N64: define void @foo5(%struct.S0* noalias sret %agg.result, i64, fp128 %a0) +// N64: call void @foo6(%struct.S0* sret %agg.result, i32 1, i32 2, i64 undef, fp128 %a0) +// N64: declare void @foo6(%struct.S0* sret, i32, i32, i64, fp128) extern S0 foo6(int, int, long double); @@ -41,3 +42,14 @@ S0 foo5(long double a0) { return foo6(1, 2, a0); } +// Do not insert padding if ABI is O32. +// +// O32: define void @foo7(float %a0, double %a1) +// O32: declare void @foo8(float, double) + +extern void foo8(float, double); + +void foo7(float a0, double a1) { + foo8(a0 + 1.0f, a1 + 2.0); +} + -- 2.40.0