[llvm-commits] [llvm] r65960 - in /llvm/trunk: lib/Transforms/Scalar/ScalarReplAggregates.cpp lib/Transforms/Utils/SimplifyCFG.cpp test/BugPoint/misopt-basictest.ll

[Bill Wendling]

Author: void
Date: Tue Mar  3 13:18:49 2009
New Revision: 65960

URL: http://llvm.org/viewvc/llvm-project?rev=65960&view=rev
Log:
Use > instead of >=. We want to promote aggregates of 128-bytes.

Modified:
    llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp
    llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
    llvm/trunk/test/BugPoint/misopt-basictest.ll

Modified: llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp?rev=65960&r1=65959&r2=65960&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/ScalarReplAggregates.cpp Tue Mar  3 13:18:49 2009
@@ -255,7 +255,7 @@
     uint64_t AllocaSize = TD->getTypePaddedSize(AI->getAllocatedType());
 
     // Do not promote any struct whose size is too big.
-    if (AllocaSize >= SRThreshold) continue;
+    if (AllocaSize > SRThreshold) continue;
         
     if ((isa<StructType>(AI->getAllocatedType()) ||
          isa<ArrayType>(AI->getAllocatedType())) &&

Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=65960&r1=65959&r2=65960&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Tue Mar  3 13:18:49 2009
@@ -33,6 +33,10 @@
 
 STATISTIC(NumSpeculations, "Number of speculative executed instructions");
 
+#include "llvm/Support/CommandLine.h"
+static cl::opt<bool>
+DisableXForm("disable-xform", cl::Hidden, cl::init(false));
+
 /// SafeToMergeTerminators - Return true if it is safe to merge these two
 /// terminator instructions together.
 ///
@@ -1782,7 +1786,7 @@
       }
 
       // If we found some, do the transformation!
-      if (!UncondBranchPreds.empty()) {
+      if (!UncondBranchPreds.empty() && !DisableXForm) {
         while (!UncondBranchPreds.empty()) {
           BasicBlock *Pred = UncondBranchPreds.back();
           DOUT << "FOLDING: " << *BB

Modified: llvm/trunk/test/BugPoint/misopt-basictest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/BugPoint/misopt-basictest.ll?rev=65960&r1=65959&r2=65960&view=diff

==============================================================================
--- llvm/trunk/test/BugPoint/misopt-basictest.ll (original)
+++ llvm/trunk/test/BugPoint/misopt-basictest.ll Tue Mar  3 13:18:49 2009
@@ -1,4 +1,4 @@
-; RUN: bugpoint %s -dce -bugpoint-deletecalls -simplifycfg -silence-passes
+; RUN: bugpoint %s -dce -bugpoint-deletecalls -simplifycfg -silence-passes -gcc-tool-args -m32
 
 @.LC0 = internal global [13 x i8] c"Hello World\0A\00"          ; <[13 x i8]*> [#uses=1]