commit bb73b74a9f6ad26c2ab30557bfe6916a44ed75f6
author Tim Murray <timmurray@google.com> Tue Nov 04 11:20:10 2014 -0800
committer Stephen Hines <srhines@google.com> Thu Nov 20 17:47:01 2014 -0800
tree 075f90c4d436650b2fef8037d1864abac06e068c
parent b7bce7436876884dfd78ec41d147ddbe47e37cbd

Modify RSForEachExpand to move casting of pointer types outside the inner loop.

This makes autovectorization work in some limited cases.

bug 18071147

Change-Id: If9f08760310b90f62e88dfce257575205b3cb5b2

lib/Renderscript/RSForEachExpand.cpp

diff --git a/lib/Renderscript/RSForEachExpand.cpp b/lib/Renderscript/RSForEachExpand.cpp
index a9150a7..0a1cc0f 100644
--- a/lib/Renderscript/RSForEachExpand.cpp
+++ b/lib/Renderscript/RSForEachExpand.cpp
@@ -579,9 +579,10 @@
     llvm::Function::arg_iterator ArgIter = Function->arg_begin();
 
     // Check the return type
-    llvm::Type     *OutTy      = nullptr;
-    llvm::Value    *OutStep    = nullptr;
-    llvm::LoadInst *OutBasePtr = nullptr;
+    llvm::Type     *OutTy            = nullptr;
+    llvm::Value    *OutStep          = nullptr;
+    llvm::LoadInst *OutBasePtr       = nullptr;
+    llvm::Value    *CastedOutBasePtr = nullptr;
 
     bool PassOutByPointer = false;
 
@@ -607,12 +608,13 @@
       if (gEnableRsTbaa) {
         OutBasePtr->setMetadata("tbaa", TBAAPointer);
       }
+      CastedOutBasePtr = Builder.CreatePointerCast(OutBasePtr, OutTy, "casted_out");
     }
 
-    llvm::SmallVector<llvm::Type*,     8> InTypes;
-    llvm::SmallVector<llvm::Value*,    8> InSteps;
-    llvm::SmallVector<llvm::LoadInst*, 8> InBasePtrs;
-    llvm::SmallVector<bool,            8> InIsStructPointer;
+    llvm::SmallVector<llvm::Type*,  8> InTypes;
+    llvm::SmallVector<llvm::Value*, 8> InSteps;
+    llvm::SmallVector<llvm::Value*, 8> InBasePtrs;
+    llvm::SmallVector<bool,         8> InIsStructPointer;
 
     if (NumInputs > 0) {
       llvm::Value *InsMember = Builder.CreateStructGEP(Arg_p, PARAM_FIELD_INS);
@@ -657,14 +659,15 @@
           llvm::Value    *InputAddr = Builder.CreateGEP(InsBasePtr, IndexVal);
           llvm::LoadInst *InBasePtr = Builder.CreateLoad(InputAddr,
                                                          "input_base");
-
+          llvm::Value    *CastInBasePtr = Builder.CreatePointerCast(InBasePtr,
+                                                                    InType, "casted_in");
           if (gEnableRsTbaa) {
             InBasePtr->setMetadata("tbaa", TBAAPointer);
           }
 
           InTypes.push_back(InType);
           InSteps.push_back(InStep);
-          InBasePtrs.push_back(InBasePtr);
+          InBasePtrs.push_back(CastInBasePtr);
       }
     }
 
@@ -688,12 +691,10 @@
     // Output
 
     llvm::Value *OutPtr = nullptr;
-    if (OutBasePtr) {
+    if (CastedOutBasePtr) {
       llvm::Value *OutOffset = Builder.CreateSub(IV, Arg_x1);
 
-      OutOffset = Builder.CreateMul(OutOffset, OutStep);
-      OutPtr    = Builder.CreateGEP(OutBasePtr, OutOffset);
-      OutPtr    = Builder.CreatePointerCast(OutPtr, OutTy);
+      OutPtr    = Builder.CreateGEP(CastedOutBasePtr, OutOffset);
 
       if (PassOutByPointer) {
         RootArgs.push_back(OutPtr);
@@ -706,11 +707,7 @@
       llvm::Value *Offset = Builder.CreateSub(IV, Arg_x1);
 
       for (size_t Index = 0; Index < NumInputs; ++Index) {
-        llvm::Value *InOffset = Builder.CreateMul(Offset, InSteps[Index]);
-        llvm::Value *InPtr    = Builder.CreateGEP(InBasePtrs[Index], InOffset);
-
-        InPtr = Builder.CreatePointerCast(InPtr, InTypes[Index]);
-
+        llvm::Value *InPtr    = Builder.CreateGEP(InBasePtrs[Index], Offset);
         llvm::Value *Input;
 
         if (InIsStructPointer[Index]) {