[llvm-commits] CVS: llvm/test/Regression/Reoptimizer/inst/Makefile Test1.c

[Joel Stanley]

Changes in directory llvm/test/Regression/Reoptimizer/inst:

Makefile updated: 1.5 -> 1.5.2.1
Test1.c updated: 1.4.2.1 -> 1.4.2.2

---
Log message:



---
Diffs of the changes:

Index: llvm/test/Regression/Reoptimizer/inst/Makefile
diff -u llvm/test/Regression/Reoptimizer/inst/Makefile:1.5 llvm/test/Regression/Reoptimizer/inst/Makefile:1.5.2.1
--- llvm/test/Regression/Reoptimizer/inst/Makefile:1.5	Thu May 22 22:25:43 2003
+++ llvm/test/Regression/Reoptimizer/inst/Makefile	Tue Jun 24 10:29:11 2003
@@ -1,4 +1,5 @@
-LEVEL = /localhome/$(USER)/Research/llvm
+LEVEL = ../../../../
+#LEVEL = /localhome/$(USER)/Research/llvm
 
 CC = /usr/dcs/software/evaluation/bin/gcc
 CXX = /usr/dcs/software/evaluation/bin/g++
@@ -10,8 +11,8 @@
 	   $(LEVEL)/lib/Debug/libtracecache.a   \
 	   $(LEVEL)/lib/Debug/libbininterface.a
 
-
-LIBINSTRBC = /home/vadve/lattner/cvs/gcc_install_sparc/llvm/lib/libinstr.bc
+CRTEND = $(LLVM_LIB_SEARCH_PATH)/crtend.o
+LIBINSTRBC = $(LEVEL)/test/Libraries/Output/libinstr.bc
 
 Test1: Test1.o $(PERFOBJS)
         # NB: The only reason we don't include the PAPI library in the list of exclusions
@@ -19,8 +20,8 @@
         #     tables, and thus will never try to instrument the PAPI functions, which are
         #     dynamically linked.
 
-	mkexcl $(PERFOBJS) libinstr.o > mkexcl.cpp
-	$(CXX) -o Test1 $^ mkexcl.cpp -L$(PAPIDIR) -lpapi -lelf
+	mkexcl $(PERFOBJS) libinstr.o crtend.o > mkexcl.cpp
+	$(CXX) -o Test1 $^ mkexcl.cpp crtend.o -L$(PAPIDIR) -lpapi -lelf
 
 Test1.o: Test1.opt.c
 	$(CC) -c Test1.opt.c -o Test1.o
@@ -28,12 +29,16 @@
 Test1.opt.c: Test1.opt.bc
 	dis -c < Test1.opt.bc > Test1.opt.c
 
-Test1.opt.bc: Test1.bc libinstr.o $(LEVEL)/lib/Debug/libperf.so
+Test1.opt.bc: Test1.bc libinstr.o crtend.o $(LEVEL)/lib/Debug/libperf.so
 	opt -load $(LEVEL)/lib/Debug/libperf.so -pp1 -emitfuncs -deadtypeelim < Test1.bc > Test1.opt.o
 	gccld -disable-internalize $(LIBINSTRBC) Test1.opt.o -o Test1.opt
 
 Test1.bc: Test1.c
 	$(LLVMGCC) -I$(LOCAL_CVSROOT)/llvm/lib/Reoptimizer/Inst/rtl -c Test1.c -o Test1.bc
+
+crtend.o: $(CRTEND)
+	dis -c < $^ > $(@:.o=.c)
+	$(CC) -c $(@:.o=.c) 2>/dev/null
 
 libinstr.o: $(LIBINSTRBC)
 	dis -c < $^ > $(@:.o=.c)


Index: llvm/test/Regression/Reoptimizer/inst/Test1.c
diff -u llvm/test/Regression/Reoptimizer/inst/Test1.c:1.4.2.1 llvm/test/Regression/Reoptimizer/inst/Test1.c:1.4.2.2
--- llvm/test/Regression/Reoptimizer/inst/Test1.c:1.4.2.1	Fri May 30 10:23:50 2003
+++ llvm/test/Regression/Reoptimizer/inst/Test1.c	Tue Jun 24 10:29:11 2003
@@ -22,10 +22,6 @@
     printf("Just about to call fibs() for the first time...\n");
     fibs();
 
-    registerIntervalInst(42, pp_L1_cache_miss_start,
-                         pp_L1_cache_miss_end, sizeof(int),
-                         &l1cachemiss);
-
     printf("Just about to call fibs() for the second time...\n");
     fibs();
 
@@ -55,6 +51,10 @@
 
     printf("after for loop...\n");
     fflush(stdout);
+
+    registerIntervalInst(42, pp_L1_cache_miss_start,
+                         pp_L1_cache_miss_end, sizeof(int),
+                         &l1cachemiss);
 
     pp_declareIntervalEnd(42, &tmp);