[llvm-commits] [poolalloc] r115189 - in /poolalloc/trunk: lib/DSA/DataStructure.cpp test/dsa/local/arrayPointers.ll test/dsa/local/arrayPointers1.ll test/dsa/local/arrayPointers2.ll test/dsa/local/arrayPointers3.ll test/dsa/local/array_in_struct.ll test/dsa/local/arrays1.ll test/dsa/var_arg/basic_32.ll test/dsa/var_arg/basic_64.ll
Arushi Aggarwal
aggarwa4 at illinois.edu
Thu Sep 30 12:19:01 PDT 2010
Author: aggarwa4
Date: Thu Sep 30 14:19:01 2010
New Revision: 115189
URL: http://llvm.org/viewvc/llvm-project?rev=115189&view=rev
Log:
Collapsed nodes should have their type information erased.
The array flag is also a part of this, and must be removed.
Modified test cases to reflect the same too.
Modified:
poolalloc/trunk/lib/DSA/DataStructure.cpp
poolalloc/trunk/test/dsa/local/arrayPointers.ll
poolalloc/trunk/test/dsa/local/arrayPointers1.ll
poolalloc/trunk/test/dsa/local/arrayPointers2.ll
poolalloc/trunk/test/dsa/local/arrayPointers3.ll
poolalloc/trunk/test/dsa/local/array_in_struct.ll
poolalloc/trunk/test/dsa/local/arrays1.ll
poolalloc/trunk/test/dsa/var_arg/basic_32.ll
poolalloc/trunk/test/dsa/var_arg/basic_64.ll
Modified: poolalloc/trunk/lib/DSA/DataStructure.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DataStructure.cpp?rev=115189&r1=115188&r2=115189&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DataStructure.cpp (original)
+++ poolalloc/trunk/lib/DSA/DataStructure.cpp Thu Sep 30 14:19:01 2010
@@ -238,7 +238,9 @@
++NumFolds;
//Collapsed nodes don't really need a type
+ //Clear the array flag too. Node should be of type VOID
TyMap.clear();
+ maskNodeTypes(~ArrayNode);
// If this node has a size that is <= 1, we don't need to create a forwarding
// node.
Modified: poolalloc/trunk/test/dsa/local/arrayPointers.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/local/arrayPointers.ll?rev=115189&r1=115188&r2=115189&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/local/arrayPointers.ll (original)
+++ poolalloc/trunk/test/dsa/local/arrayPointers.ll Thu Sep 30 14:19:01 2010
@@ -1,7 +1,7 @@
;2D array using pointers. Should be folded
-;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array:0,FoldedVOIDArray
-;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array:0:0,FoldedVOIDArray
+;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array:0,FoldedVOID
+;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array:0:0,FoldedVOID
;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array,0:i32**
; ModuleID = 'arrayPointers.bc'
Modified: poolalloc/trunk/test/dsa/local/arrayPointers1.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/local/arrayPointers1.ll?rev=115189&r1=115188&r2=115189&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/local/arrayPointers1.ll (original)
+++ poolalloc/trunk/test/dsa/local/arrayPointers1.ll Thu Sep 30 14:19:01 2010
@@ -1,7 +1,7 @@
; 2D array as array of pointers. Array should not be folded.
;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array,0:i32*Array
-;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array:0,FoldedVOIDArray
+;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array:0,FoldedVOID
; ModuleID = 'arrayPointers1.bc'
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
Modified: poolalloc/trunk/test/dsa/local/arrayPointers2.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/local/arrayPointers2.ll?rev=115189&r1=115188&r2=115189&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/local/arrayPointers2.ll (original)
+++ poolalloc/trunk/test/dsa/local/arrayPointers2.ll Thu Sep 30 14:19:01 2010
@@ -1,6 +1,6 @@
; 2D array as array of pointers. Array should not be folded.
-;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array:0,FoldedVOIDArray
+;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array:0,FoldedVOID
;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array,0:%\struct.structType*Array
Modified: poolalloc/trunk/test/dsa/local/arrayPointers3.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/local/arrayPointers3.ll?rev=115189&r1=115188&r2=115189&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/local/arrayPointers3.ll (original)
+++ poolalloc/trunk/test/dsa/local/arrayPointers3.ll Thu Sep 30 14:19:01 2010
@@ -1,7 +1,7 @@
; array of pointers to arrays of structs. The inner array gets folded.
;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array,0:%\struct.structType*Array
-;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array:0,main:row1,main:row2,FoldedVOIDArray
+;RUN: dsaopt %s -dsa-local -analyze -check-type=main:array:0,main:row1,main:row2,FoldedVOID
;RUN: dsaopt %s -dsa-local -analyze -check-same-node=main:row1,main:row2,main:array:0
; ModuleID = 'arrayPointers3.bc'
Modified: poolalloc/trunk/test/dsa/local/array_in_struct.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/local/array_in_struct.ll?rev=115189&r1=115188&r2=115189&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/local/array_in_struct.ll (original)
+++ poolalloc/trunk/test/dsa/local/array_in_struct.ll Thu Sep 30 14:19:01 2010
@@ -1,7 +1,7 @@
; An example with a struct with an array. The node for the struct must be folded
; if we access the array.
-;RUN: dsaopt %s -dsa-local -analyze -check-type=test1:arr,FoldedVOIDArray
+;RUN: dsaopt %s -dsa-local -analyze -check-type=test1:arr,FoldedVOID
; ModuleID = 'test1.bc'
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
Modified: poolalloc/trunk/test/dsa/local/arrays1.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/local/arrays1.ll?rev=115189&r1=115188&r2=115189&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/local/arrays1.ll (original)
+++ poolalloc/trunk/test/dsa/local/arrays1.ll Thu Sep 30 14:19:01 2010
@@ -3,7 +3,7 @@
;RUN: dsaopt %s -dsa-local -analyze -check-same-node=func:tmp:0:0,func:tmp:0
;RUN: dsaopt %s -dsa-local -analyze -check-same-node=func:c:0,func:tmp:0,func:s2:8
-;RUN: dsaopt %s -dsa-local -analyze -check-type=func:tmp:0,FoldedVOIDArray
+;RUN: dsaopt %s -dsa-local -analyze -check-type=func:tmp:0,FoldedVOID
; ModuleID = 'arrays1.bc'
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
Modified: poolalloc/trunk/test/dsa/var_arg/basic_32.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/var_arg/basic_32.ll?rev=115189&r1=115188&r2=115189&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/var_arg/basic_32.ll (original)
+++ poolalloc/trunk/test/dsa/var_arg/basic_32.ll Thu Sep 30 14:19:01 2010
@@ -12,7 +12,7 @@
; Don't propagate the VAStart flag to children...
;RUN: dsaopt %s -dsa-local -analyze -verify-flags "get:ap:0-V"
; On 32-bit, VAStart node should point to an array of the arguments
-;RUN: dsaopt %s -dsa-local -analyze -check-type=get:ap:0,FoldedVOIDArray
+;RUN: dsaopt %s -dsa-local -analyze -check-type=get:ap:0,FoldedVOID
; And the argument node should be of the proper type (in this case an i32)
;RUN: dsaopt %s -dsa-local -analyze -check-type=get:ap:0:0,0:i32
; The argument should be ref'd, but not mod'd
Modified: poolalloc/trunk/test/dsa/var_arg/basic_64.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/var_arg/basic_64.ll?rev=115189&r1=115188&r2=115189&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/var_arg/basic_64.ll (original)
+++ poolalloc/trunk/test/dsa/var_arg/basic_64.ll Thu Sep 30 14:19:01 2010
@@ -13,7 +13,7 @@
;RUN: dsaopt %s -dsa-local -analyze -verify-flags "get:ap:8-V"
;RUN: dsaopt %s -dsa-local -analyze -verify-flags "get:ap:16-V"
; On 64-bit, VAStart node should be a struct pointing to an array of the arguments
-;RUN: dsaopt %s -dsa-local -analyze -check-type=get:ap:8,FoldedVOIDArray
+;RUN: dsaopt %s -dsa-local -analyze -check-type=get:ap:8,FoldedVOID
; Both offsets 8 and 16 point to the array as a simplification.
; Verify that these are indeed the same node.
;RUN: dsaopt %s -dsa-local -analyze -check-same-node \
More information about the llvm-commits
mailing list