[llvm-commits] [vector_llvm] CVS: llvm/lib/Analysis/LoadValueNumbering.cpp ScalarEvolution.cpp

[Robert Bocchino]

Changes in directory llvm/lib/Analysis:

LoadValueNumbering.cpp updated: 1.33 -> 1.33.2.1
ScalarEvolution.cpp updated: 1.43 -> 1.43.2.1
---
Log message:

Initial commit of Vector LLVM.


---
Diffs of the changes:  (+5 -1)

 LoadValueNumbering.cpp |    4 ++++
 ScalarEvolution.cpp    |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)


Index: llvm/lib/Analysis/LoadValueNumbering.cpp
diff -u llvm/lib/Analysis/LoadValueNumbering.cpp:1.33 llvm/lib/Analysis/LoadValueNumbering.cpp:1.33.2.1
--- llvm/lib/Analysis/LoadValueNumbering.cpp:1.33	Mon Jun 20 10:25:22 2005
+++ llvm/lib/Analysis/LoadValueNumbering.cpp	Tue Oct 18 14:21:56 2005
@@ -32,6 +32,7 @@
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Target/TargetData.h"
+#include "llvm/DerivedTypes.h"
 #include <set>
 #include <algorithm>
 using namespace llvm;
@@ -283,6 +284,9 @@
   LoadInst *LI = cast<LoadInst>(V);
   if (LI->isVolatile())
     return getAnalysis<ValueNumbering>().getEqualNumberNodes(V, RetVals);
+  // FIXME:  This is a temporary fix to make vectors work
+  if (isa<VectorType>(LI->getType()) && !isa<FixedVectorType>(LI->getType()))
+    return;
 
   Value *LoadPtr = LI->getOperand(0);
   BasicBlock *LoadBB = LI->getParent();


Index: llvm/lib/Analysis/ScalarEvolution.cpp
diff -u llvm/lib/Analysis/ScalarEvolution.cpp:1.43 llvm/lib/Analysis/ScalarEvolution.cpp:1.43.2.1
--- llvm/lib/Analysis/ScalarEvolution.cpp:1.43	Wed Sep 28 17:30:58 2005
+++ llvm/lib/Analysis/ScalarEvolution.cpp	Tue Oct 18 14:21:56 2005
@@ -2509,7 +2509,7 @@
 
   OS << "Classifying expressions for: " << F.getName() << "\n";
   for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I)
-    if (I->getType()->isInteger()) {
+    if (I->getType()->isInteger() && !isa<VectorType>(I->getType())) {
       OS << *I;
       OS << "  --> ";
       SCEVHandle SV = getSCEV(&*I);