[llvm-commits] [poolalloc] r117614 - in /poolalloc/trunk: lib/DSA/Local.cpp test/dsa/callgraph/loop1.c test/dsa/callgraph/loop1.ll test/dsa/callgraph/loop2.c test/dsa/callgraph/loop2.ll test/dsa/local/flags.c test/dsa/local/flags.ll test/dsa/local/malloc.ll test/dsa/td/call1.ll test/dsa/td/call2.ll test/dsa/td/params.ll test/dsa/td/recur.ll test/dsa/td/recur1.ll test/dsa/td/recur2.ll
Arushi Aggarwal
aggarwa4 at illinois.edu
Thu Oct 28 15:07:00 PDT 2010
Author: aggarwa4
Date: Thu Oct 28 17:07:00 2010
New Revision: 117614
URL: http://llvm.org/viewvc/llvm-project?rev=117614&view=rev
Log:
Move handling of malloc out of local pass. Let stdlib handle it.
Changes to testcases to use dsa-stdlib, instead of dsa-local when
checking for H flag.
Added test cases for call graph.
Added:
poolalloc/trunk/test/dsa/callgraph/loop1.c
poolalloc/trunk/test/dsa/callgraph/loop1.ll
poolalloc/trunk/test/dsa/callgraph/loop2.c
poolalloc/trunk/test/dsa/callgraph/loop2.ll
Modified:
poolalloc/trunk/lib/DSA/Local.cpp
poolalloc/trunk/test/dsa/local/flags.c
poolalloc/trunk/test/dsa/local/flags.ll
poolalloc/trunk/test/dsa/local/malloc.ll
poolalloc/trunk/test/dsa/td/call1.ll
poolalloc/trunk/test/dsa/td/call2.ll
poolalloc/trunk/test/dsa/td/params.ll
poolalloc/trunk/test/dsa/td/recur.ll
poolalloc/trunk/test/dsa/td/recur1.ll
poolalloc/trunk/test/dsa/td/recur2.ll
Modified: poolalloc/trunk/lib/DSA/Local.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/Local.cpp?rev=117614&r1=117613&r2=117614&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/Local.cpp (original)
+++ poolalloc/trunk/lib/DSA/Local.cpp Thu Oct 28 17:07:00 2010
@@ -103,30 +103,9 @@
// Visitor functions, used to handle each instruction type we encounter...
friend class InstVisitor<GraphBuilder>;
- //TODO: generalize
- bool visitAllocation(CallSite CS) {
- if (Function* F = CS.getCalledFunction()) {
- if (F->hasName() && F->getName() == "malloc") {
- setDestTo(*CS.getInstruction(), createNode()->setHeapMarker());
- return true;
- }
- }
- return false;
- }
-
- //FIXME: implement in stdlib pass
-// void visitMallocInst(MallocInst &MI)
-// { setDestTo(MI, createNode()->setHeapMarker()); }
-
void visitAllocaInst(AllocaInst &AI)
{ setDestTo(AI, createNode()->setAllocaMarker()); }
- //FIXME: implement in stdlib pass
- //void visitFreeInst(FreeInst &FI)
- //{ if (DSNode *N = getValueDest(FI.getOperand(0)).getNode())
-// N->setHeapMarker();
-// }
-
//the simple ones
void visitPHINode(PHINode &PN);
void visitSelectInst(SelectInst &SI);
@@ -952,9 +931,6 @@
if (F->isIntrinsic() && visitIntrinsic(CS, F))
return;
- if (visitAllocation(CS))
- return;
-
//Can't do much about inline asm (yet!)
if (isa<InlineAsm> (Callee)) {
++NumAsmCall;
Added: poolalloc/trunk/test/dsa/callgraph/loop1.c
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/callgraph/loop1.c?rev=117614&view=auto
==============================================================================
--- poolalloc/trunk/test/dsa/callgraph/loop1.c (added)
+++ poolalloc/trunk/test/dsa/callgraph/loop1.c Thu Oct 28 17:07:00 2010
@@ -0,0 +1,40 @@
+#include<stdio.h>
+#include<stdlib.h>
+
+typedef int* (*funcptr)(int *);
+
+funcptr FP;
+struct S {
+funcptr f;
+};
+
+int * B() {
+}
+int * A() {
+}
+void D(funcptr f) {
+ f = B;
+}
+int * SetFP(void * f){
+ D(FP);
+}
+
+static int * init() {
+ FP = A;
+ (*FP)(malloc(sizeof(int)));
+ return (*FP)(malloc(sizeof(int)));
+}
+void init2(struct S *o){
+ o->f = B;
+}
+static void init1() {
+ struct S * t = malloc(sizeof(struct S));
+ t->f = FP;
+ init2(t);
+
+}
+
+int main() {
+ init();
+ init1();
+}
Added: poolalloc/trunk/test/dsa/callgraph/loop1.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/callgraph/loop1.ll?rev=117614&view=auto
==============================================================================
--- poolalloc/trunk/test/dsa/callgraph/loop1.ll (added)
+++ poolalloc/trunk/test/dsa/callgraph/loop1.ll Thu Oct 28 17:07:00 2010
@@ -0,0 +1,132 @@
+;RUN: dsaopt %s -dsa-bu -analyze -check-callees=main,init,init1
+;RUN: dsaopt %s -dsa-bu -analyze -check-callees=init,A,B,malloc
+;RUN: dsaopt %s -dsa-bu -analyze -check-callees=init1,init2
+
+; ModuleID = 'loop1.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"
+target triple = "x86_64-unknown-linux-gnu"
+
+%struct.S = type { i32* (i32*)* }
+
+ at FP = common global i32* (i32*)* null ; <i32* (i32*)**> [#uses=5]
+
+define i32* @B() nounwind {
+entry:
+ %retval = alloca i32* ; <i32**> [#uses=1]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ br label %return
+
+return: ; preds = %entry
+ %retval1 = load i32** %retval ; <i32*> [#uses=1]
+ ret i32* %retval1
+}
+
+define i32* @A() nounwind {
+entry:
+ %retval = alloca i32* ; <i32**> [#uses=1]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ br label %return
+
+return: ; preds = %entry
+ %retval1 = load i32** %retval ; <i32*> [#uses=1]
+ ret i32* %retval1
+}
+
+define void @D(i32* (i32*)* %f) nounwind {
+entry:
+ %f_addr = alloca i32* (i32*)* ; <i32* (i32*)**> [#uses=2]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ store i32* (i32*)* %f, i32* (i32*)** %f_addr
+ store i32* (i32*)* bitcast (i32* ()* @B to i32* (i32*)*), i32* (i32*)** %f_addr, align 8
+ br label %return
+
+return: ; preds = %entry
+ ret void
+}
+
+define i32* @SetFP(i8* %f) nounwind {
+entry:
+ %f_addr = alloca i8* ; <i8**> [#uses=1]
+ %retval = alloca i32* ; <i32**> [#uses=1]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ store i8* %f, i8** %f_addr
+ %0 = load i32* (i32*)** @FP, align 8 ; <i32* (i32*)*> [#uses=1]
+ call void @D(i32* (i32*)* %0) nounwind
+ br label %return
+
+return: ; preds = %entry
+ %retval1 = load i32** %retval ; <i32*> [#uses=1]
+ ret i32* %retval1
+}
+
+define internal i32* @init() nounwind {
+entry:
+ %retval = alloca i32* ; <i32**> [#uses=2]
+ %0 = alloca i32* ; <i32**> [#uses=2]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ store i32* (i32*)* bitcast (i32* ()* @A to i32* (i32*)*), i32* (i32*)** @FP, align 8
+ %1 = load i32* (i32*)** @FP, align 8 ; <i32* (i32*)*> [#uses=1]
+ %2 = call noalias i8* @malloc(i64 4) nounwind ; <i8*> [#uses=1]
+ %3 = bitcast i8* %2 to i32* ; <i32*> [#uses=1]
+ %4 = call i32* %1(i32* %3) nounwind ; <i32*> [#uses=0]
+ %5 = load i32* (i32*)** @FP, align 8 ; <i32* (i32*)*> [#uses=1]
+ %6 = call noalias i8* @malloc(i64 4) nounwind ; <i8*> [#uses=1]
+ %7 = bitcast i8* %6 to i32* ; <i32*> [#uses=1]
+ %8 = call i32* %5(i32* %7) nounwind ; <i32*> [#uses=1]
+ store i32* %8, i32** %0, align 8
+ %9 = load i32** %0, align 8 ; <i32*> [#uses=1]
+ store i32* %9, i32** %retval, align 8
+ br label %return
+
+return: ; preds = %entry
+ %retval1 = load i32** %retval ; <i32*> [#uses=1]
+ ret i32* %retval1
+}
+
+declare noalias i8* @malloc(i64) nounwind
+
+define void @init2(%struct.S* %o) nounwind {
+entry:
+ %o_addr = alloca %struct.S* ; <%struct.S**> [#uses=2]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ store %struct.S* %o, %struct.S** %o_addr
+ %0 = load %struct.S** %o_addr, align 8 ; <%struct.S*> [#uses=1]
+ %1 = getelementptr inbounds %struct.S* %0, i32 0, i32 0 ; <i32* (i32*)**> [#uses=1]
+ store i32* (i32*)* bitcast (i32* ()* @B to i32* (i32*)*), i32* (i32*)** %1, align 8
+ br label %return
+
+return: ; preds = %entry
+ ret void
+}
+
+define internal void @init1() nounwind {
+entry:
+ %t = alloca %struct.S* ; <%struct.S**> [#uses=3]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ %0 = call noalias i8* @malloc(i64 8) nounwind ; <i8*> [#uses=1]
+ %1 = bitcast i8* %0 to %struct.S* ; <%struct.S*> [#uses=1]
+ store %struct.S* %1, %struct.S** %t, align 8
+ %2 = load i32* (i32*)** @FP, align 8 ; <i32* (i32*)*> [#uses=1]
+ %3 = load %struct.S** %t, align 8 ; <%struct.S*> [#uses=1]
+ %4 = getelementptr inbounds %struct.S* %3, i32 0, i32 0 ; <i32* (i32*)**> [#uses=1]
+ store i32* (i32*)* %2, i32* (i32*)** %4, align 8
+ %5 = load %struct.S** %t, align 8 ; <%struct.S*> [#uses=1]
+ call void @init2(%struct.S* %5) nounwind
+ br label %return
+
+return: ; preds = %entry
+ ret void
+}
+
+define i32 @main() nounwind {
+entry:
+ %retval = alloca i32 ; <i32*> [#uses=1]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ %0 = call i32* @init() nounwind ; <i32*> [#uses=0]
+ call void @init1() nounwind
+ br label %return
+
+return: ; preds = %entry
+ %retval1 = load i32* %retval ; <i32> [#uses=1]
+ ret i32 %retval1
+}
Added: poolalloc/trunk/test/dsa/callgraph/loop2.c
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/callgraph/loop2.c?rev=117614&view=auto
==============================================================================
--- poolalloc/trunk/test/dsa/callgraph/loop2.c (added)
+++ poolalloc/trunk/test/dsa/callgraph/loop2.c Thu Oct 28 17:07:00 2010
@@ -0,0 +1,31 @@
+#include<stdio.h>
+#include<stdlib.h>
+
+typedef int* (*funcptr)(int *);
+typedef int* (*funcptr2)(void *);
+
+funcptr FP;
+
+int * B() {
+}
+int * A() {
+}
+void D(funcptr f) {
+ f = B;
+}
+int * SetFP(void * f){
+ D(FP);
+}
+
+int * init() {
+ FP = A;
+ funcptr2 setter = SetFP;
+ (*setter)(malloc(3));
+ (*FP)(malloc(sizeof(int)));
+ return (*FP)(malloc(sizeof(int)));
+}
+
+int main() {
+ init();
+
+}
Added: poolalloc/trunk/test/dsa/callgraph/loop2.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/callgraph/loop2.ll?rev=117614&view=auto
==============================================================================
--- poolalloc/trunk/test/dsa/callgraph/loop2.ll (added)
+++ poolalloc/trunk/test/dsa/callgraph/loop2.ll Thu Oct 28 17:07:00 2010
@@ -0,0 +1,100 @@
+;RUN: dsaopt %s -dsa-bu -analyze -check-callees=main,init
+;RUN: dsaopt %s -dsa-bu -analyze -check-callees=init,A,B,SetFP
+
+; ModuleID = 'loop2.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"
+target triple = "x86_64-unknown-linux-gnu"
+
+ at FP = common global i32* (i32*)* null ; <i32* (i32*)**> [#uses=4]
+
+define i32* @B() nounwind {
+entry:
+ %retval = alloca i32* ; <i32**> [#uses=1]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ br label %return
+
+return: ; preds = %entry
+ %retval1 = load i32** %retval ; <i32*> [#uses=1]
+ ret i32* %retval1
+}
+
+define i32* @A() nounwind {
+entry:
+ %retval = alloca i32* ; <i32**> [#uses=1]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ br label %return
+
+return: ; preds = %entry
+ %retval1 = load i32** %retval ; <i32*> [#uses=1]
+ ret i32* %retval1
+}
+
+define void @D(i32* (i32*)* %f) nounwind {
+entry:
+ %f_addr = alloca i32* (i32*)* ; <i32* (i32*)**> [#uses=2]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ store i32* (i32*)* %f, i32* (i32*)** %f_addr
+ store i32* (i32*)* bitcast (i32* ()* @B to i32* (i32*)*), i32* (i32*)** %f_addr, align 8
+ br label %return
+
+return: ; preds = %entry
+ ret void
+}
+
+define i32* @SetFP(i8* %f) nounwind {
+entry:
+ %f_addr = alloca i8* ; <i8**> [#uses=1]
+ %retval = alloca i32* ; <i32**> [#uses=1]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ store i8* %f, i8** %f_addr
+ %0 = load i32* (i32*)** @FP, align 8 ; <i32* (i32*)*> [#uses=1]
+ call void @D(i32* (i32*)* %0) nounwind
+ br label %return
+
+return: ; preds = %entry
+ %retval1 = load i32** %retval ; <i32*> [#uses=1]
+ ret i32* %retval1
+}
+
+define i32* @init() nounwind {
+entry:
+ %retval = alloca i32* ; <i32**> [#uses=2]
+ %0 = alloca i32* ; <i32**> [#uses=2]
+ %setter = alloca i32* (i8*)* ; <i32* (i8*)**> [#uses=2]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ store i32* (i32*)* bitcast (i32* ()* @A to i32* (i32*)*), i32* (i32*)** @FP, align 8
+ store i32* (i8*)* @SetFP, i32* (i8*)** %setter, align 8
+ %1 = call noalias i8* @malloc(i64 3) nounwind ; <i8*> [#uses=1]
+ %2 = load i32* (i8*)** %setter, align 8 ; <i32* (i8*)*> [#uses=1]
+ %3 = call i32* %2(i8* %1) nounwind ; <i32*> [#uses=0]
+ %4 = load i32* (i32*)** @FP, align 8 ; <i32* (i32*)*> [#uses=1]
+ %5 = call noalias i8* @malloc(i64 4) nounwind ; <i8*> [#uses=1]
+ %6 = bitcast i8* %5 to i32* ; <i32*> [#uses=1]
+ %7 = call i32* %4(i32* %6) nounwind ; <i32*> [#uses=0]
+ %8 = load i32* (i32*)** @FP, align 8 ; <i32* (i32*)*> [#uses=1]
+ %9 = call noalias i8* @malloc(i64 4) nounwind ; <i8*> [#uses=1]
+ %10 = bitcast i8* %9 to i32* ; <i32*> [#uses=1]
+ %11 = call i32* %8(i32* %10) nounwind ; <i32*> [#uses=1]
+ store i32* %11, i32** %0, align 8
+ %12 = load i32** %0, align 8 ; <i32*> [#uses=1]
+ store i32* %12, i32** %retval, align 8
+ br label %return
+
+return: ; preds = %entry
+ %retval1 = load i32** %retval ; <i32*> [#uses=1]
+ ret i32* %retval1
+}
+
+declare noalias i8* @malloc(i64) nounwind
+
+define i32 @main() nounwind {
+entry:
+ %retval = alloca i32 ; <i32*> [#uses=1]
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
+ %0 = call i32* @init() nounwind ; <i32*> [#uses=0]
+ br label %return
+
+return: ; preds = %entry
+ %retval1 = load i32* %retval ; <i32> [#uses=1]
+ ret i32 %retval1
+}
Modified: poolalloc/trunk/test/dsa/local/flags.c
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/local/flags.c?rev=117614&r1=117613&r2=117614&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/local/flags.c (original)
+++ poolalloc/trunk/test/dsa/local/flags.c Thu Oct 28 17:07:00 2010
@@ -20,6 +20,7 @@
void func() {
//Don't mod/ref
int stack_a;
+ //Mod
int * heap_a = malloc(sizeof(int));
//Mod
Modified: poolalloc/trunk/test/dsa/local/flags.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/local/flags.ll?rev=117614&r1=117613&r2=117614&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/local/flags.ll (original)
+++ poolalloc/trunk/test/dsa/local/flags.ll Thu Oct 28 17:07:00 2010
@@ -12,10 +12,16 @@
;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:stack_d+SMR"
;--Heap:
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:heap_a:0+H-MR"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:heap_b:0+HM-R"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:heap_c:0+H-M+R"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:heap_d:0+HMR"
+;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:heap_a:0+IE"
+;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:heap_b:0+IE"
+;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:heap_c:0+IE"
+;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:heap_d:0+IE"
+
+;--Heap:
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:heap_a:0+HM-R"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:heap_b:0+HM-R"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:heap_c:0+HMR"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:heap_d:0+HMR"
;--Globals:
;RUN: dsaopt %s -dsa-local -analyze -verify-flags "global_a+G-MR"
Modified: poolalloc/trunk/test/dsa/local/malloc.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/local/malloc.ll?rev=117614&r1=117613&r2=117614&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/local/malloc.ll (original)
+++ poolalloc/trunk/test/dsa/local/malloc.ll Thu Oct 28 17:07:00 2010
@@ -1,5 +1,6 @@
;--check that local detects call to malloc properly (marks them heap)
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "main:b:0+H"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "main:b:0+H"
+;RUN: dsaopt %s -dsa-local -analyze -verify-flags "main:b:0+IE"
;--check that local has b pointing to node containing c and d
;RUN: dsaopt %s -dsa-local -analyze -check-same-node=main:b:0,main:c,main:d
;--check that td/bu don't mark such nodes as incomplete
Modified: poolalloc/trunk/test/dsa/td/call1.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/td/call1.ll?rev=117614&r1=117613&r2=117614&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/td/call1.ll (original)
+++ poolalloc/trunk/test/dsa/td/call1.ll Thu Oct 28 17:07:00 2010
@@ -1,24 +1,24 @@
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:b2:0+I"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:b2:0+I"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "test:b2:0+HM-I"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:a2:0+I"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:a2:0+I"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "test:a2:0+HM-I"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:a2+IMR-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:a2+IMR-E"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "test:a2+SMRE-I"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:a1+SM-IE"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:a1:0+I-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:a1+SM-IE"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:a1:0+I-E"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "func:a1+SM-IE"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "func:a1:0+HM-EI"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:b1+SM-IE"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:b1:0+I-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:b1+SM-IE"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:b1:0+I-E"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "func:b1+SM-IE"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "func:b1:0+HM-EI"
;RUN: dsaopt %s -dsa-td -analyze -check-same-node=func:mem1,func:mem2
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:mem1:0+HI-E"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:mem2:0+HI-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:mem1:0+HI-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:mem2:0+HI-E"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "func:mem1:0+HM-IE"
; ModuleID = 'call1.bc'
Modified: poolalloc/trunk/test/dsa/td/call2.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/td/call2.ll?rev=117614&r1=117613&r2=117614&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/td/call2.ll (original)
+++ poolalloc/trunk/test/dsa/td/call2.ll Thu Oct 28 17:07:00 2010
@@ -1,24 +1,24 @@
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:b2:0+I"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:b2:0+I"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "test:b2:0+HM-I"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:a2:0+I"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:a2:0+I"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "test:a2:0+HM-I"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:a2+IMR-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:a2+IMR-E"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "test:a2+SMRE-I"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:a1+SM-IE"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:a1:0+I-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:a1+SM-IE"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:a1:0+I-E"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "func:a1+SM-I-E"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "func:a1:0+HM-IE"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:b1+SM-IE"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:b1:0+I-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:b1+SM-IE"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:b1:0+I-E"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "func:b1+SM-IE"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "func:b1:0+HM-IE"
;RUN: dsaopt %s -dsa-td -analyze -check-same-node=func:mem1,func:mem2
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:mem1:0+HI-E"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "func:mem2:0+HI-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:mem1:0+HI-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "func:mem2:0+HI-E"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "func:mem1:0+HM-IE"
; ModuleID = 'call2.bc'
Modified: poolalloc/trunk/test/dsa/td/params.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/td/params.ll?rev=117614&r1=117613&r2=117614&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/td/params.ll (original)
+++ poolalloc/trunk/test/dsa/td/params.ll Thu Oct 28 17:07:00 2010
@@ -17,11 +17,11 @@
;RUN: dsaopt %s -dsa-td -analyze -check-same-node=func:a1:0,func:b1:0,func:mem2:0,func:mem1:0,func:r1,func:r2
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:b2:0+HIR-E"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:a2:0+HIR-E"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:a2+SIMR-E"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:temp:0+HIR-E"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:temp1:0+HIR-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:b2:0+HIR-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:a2:0+HIR-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:a2+SIMR-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:temp:0+HIR-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:temp1:0+HIR-E"
;RUN: dsaopt %s -dsa-local -analyze -check-same-node=test:temp2:0,test:a2:0,test:temp1:0,test:temp:0,test:b2:0
;RUN: dsaopt %s -dsa-bu -analyze -verify-flags "test:b2:0+HIMR-E"
Modified: poolalloc/trunk/test/dsa/td/recur.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/td/recur.ll?rev=117614&r1=117613&r2=117614&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/td/recur.ll (original)
+++ poolalloc/trunk/test/dsa/td/recur.ll Thu Oct 28 17:07:00 2010
@@ -1,7 +1,7 @@
; b2 isn't exposed to external in any code we look at, but at the end of td
; we mark it external because there exists a (potential) caller context
; (externally) in which b2 would be external.
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:b2:0+HI-E"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:b2:0+HI-E"
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "test:b2:0+HME-I"
; ModuleID = 'recur.bc'
Modified: poolalloc/trunk/test/dsa/td/recur1.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/td/recur1.ll?rev=117614&r1=117613&r2=117614&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/td/recur1.ll (original)
+++ poolalloc/trunk/test/dsa/td/recur1.ll Thu Oct 28 17:07:00 2010
@@ -1,5 +1,5 @@
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "test:b2:0+HM"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:b2:0+HI"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:b2:0+HI"
; ModuleID = 'recur1.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/td/recur2.ll
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/dsa/td/recur2.ll?rev=117614&r1=117613&r2=117614&view=diff
==============================================================================
--- poolalloc/trunk/test/dsa/td/recur2.ll (original)
+++ poolalloc/trunk/test/dsa/td/recur2.ll Thu Oct 28 17:07:00 2010
@@ -1,5 +1,5 @@
;RUN: dsaopt %s -dsa-td -analyze -verify-flags "test:b2:0+HM"
-;RUN: dsaopt %s -dsa-local -analyze -verify-flags "test:b2:0+HI"
+;RUN: dsaopt %s -dsa-stdlib -analyze -verify-flags "test:b2:0+HI"
; ModuleID = 'recur2.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"
More information about the llvm-commits
mailing list