r302555 - Revert r302547 ([mips] Impose a threshold for coercion of aggregates)

Petar Jovanovic via cfe-commits cfe-commits at lists.llvm.org
Tue May 9 10:20:06 PDT 2017


Author: petarj
Date: Tue May  9 12:20:06 2017
New Revision: 302555

URL: http://llvm.org/viewvc/llvm-project?rev=302555&view=rev
Log:
Revert r302547 ([mips] Impose a threshold for coercion of aggregates)

Reverting
  Modified MipsABIInfo::classifyArgumentType so that it now coerces
  aggregate structures only if the size of said aggregate is less than 16/64
  bytes, depending on the ABI.
as it broke clang-with-lto-ubuntu builder.

Removed:
    cfe/trunk/test/CodeGen/mips-aggregate-arg.c
Modified:
    cfe/trunk/lib/CodeGen/TargetInfo.cpp

Modified: cfe/trunk/lib/CodeGen/TargetInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/TargetInfo.cpp?rev=302555&r1=302554&r2=302555&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/TargetInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/TargetInfo.cpp Tue May  9 12:20:06 2017
@@ -6695,14 +6695,6 @@ MipsABIInfo::classifyArgumentType(QualTy
       return getNaturalAlignIndirect(Ty, RAA == CGCXXABI::RAA_DirectInMemory);
     }
 
-    // Use indirect if the aggregate cannot fit into registers for
-    // passing arguments according to the ABI
-    unsigned Threshold = IsO32 ? 16 : 64;
-
-    if(getContext().getTypeSizeInChars(Ty) > CharUnits::fromQuantity(Threshold))
-      return ABIArgInfo::getIndirect(CharUnits::fromQuantity(Align), true,
-                                     getContext().getTypeAlign(Ty) / 8 > Align);
-
     // If we have reached here, aggregates are passed directly by coercing to
     // another structure type. Padding is inserted if the offset of the
     // aggregate is unaligned.

Removed: cfe/trunk/test/CodeGen/mips-aggregate-arg.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/mips-aggregate-arg.c?rev=302554&view=auto
==============================================================================
--- cfe/trunk/test/CodeGen/mips-aggregate-arg.c (original)
+++ cfe/trunk/test/CodeGen/mips-aggregate-arg.c (removed)
@@ -1,38 +0,0 @@
-// RUN: %clang_cc1 -triple mipsel-unknown-linux-gnu -S -emit-llvm -o - %s | FileCheck -check-prefix=O32 %s
-// RUN: %clang_cc1 -triple mips64el-unknown-linux-gnu -S -emit-llvm -o - %s  -target-abi n32 | FileCheck -check-prefix=N32-N64 %s
-// RUN: %clang_cc1 -triple mips64el-unknown-linux-gnu -S -emit-llvm -o - %s  -target-abi n64 | FileCheck -check-prefix=N32-N64 %s
-
-struct t1 {
-  char t1[10];
-};
-
-struct t2 {
-  char t2[20];
-};
-
-struct t3 {
-  char t3[65];
-};
-
-extern struct t1 g1;
-extern struct t2 g2;
-extern struct t3 g3;
-extern void f1(struct t1);
-extern void f2(struct t2);
-extern void f3(struct t3);
-
-void f() {
-
-// O32:  call void @f1(i32 inreg %3, i32 inreg %5, i16 inreg %7)
-// O32:  call void @f2(%struct.t2* byval align 4 %tmp)
-// O32:  call void @f3(%struct.t3* byval align 4 %tmp1)
-
-// N32-N64:  call void @f1(i64 inreg %3, i16 inreg %5)
-// N32-N64:  call void @f2(i64 inreg %9, i64 inreg %11, i32 inreg %13)
-// N32-N64:  call void @f3(%struct.t3* byval align 8 %tmp)
-
-  f1(g1);
-  f2(g2);
-  f3(g3);
-}
-




More information about the cfe-commits mailing list