[llvm-commits] [poolalloc] r97820 - in /poolalloc/branches/release_26: ./ test/Makefile test/TEST.poolalloc.Makefile

[John Criswell]

Author: criswell
Date: Fri Mar  5 14:19:05 2010
New Revision: 97820

URL: http://llvm.org/viewvc/llvm-project?rev=97820&view=rev
Log:
Creating branch of poolalloc that compiles with LLVM 2.6.

Added:
    poolalloc/branches/release_26/
      - copied from r97479, poolalloc/trunk/
Modified:
    poolalloc/branches/release_26/test/Makefile
    poolalloc/branches/release_26/test/TEST.poolalloc.Makefile

Modified: poolalloc/branches/release_26/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/branches/release_26/test/Makefile?rev=97820&r1=97479&r2=97820&view=diff
==============================================================================
--- poolalloc/branches/release_26/test/Makefile (original)
+++ poolalloc/branches/release_26/test/Makefile Fri Mar  5 14:19:05 2010
@@ -25,27 +25,32 @@
 
 
 LARGE_PROBLEM_SIZE_DIRS := \
-   MultiSource/Benchmarks/llubenchmark \
-   MultiSource/Benchmarks/FreeBench \
-   MultiSource/Benchmarks/Ptrdist \
-   MultiSource/Benchmarks/MallocBench/cfrac \
-   SingleSource/Benchmarks/McGill
+   #MultiSource/Benchmarks/llubenchmark \
+   #MultiSource/Benchmarks/FreeBench \
+   #MultiSource/Benchmarks/Ptrdist \
+   #MultiSource/Benchmarks/MallocBench/cfrac \
+   #SingleSource/Benchmarks/McGill
+
 
 LARGE_PROBLEM_SIZE_DIRS := \
    $(addprefix $(LLVM_OBJ_ROOT)/projects/llvm-test/,$(LARGE_PROBLEM_SIZE_DIRS))
 
+
 NORMAL_PROBLEM_SIZE_DIRS := \
-   MultiSource/Benchmarks/SciMark2-C/scimark2 \
-   External/Povray \
-   External/FPGrowth \
-   External/Namd \
-   External/SPEC/CINT2000/164.gzip \
-   External/SPEC/CINT2000/175.vpr \
-   External/SPEC/CINT2000/176.gcc \
-   External/SPEC/CINT2000/252.eon \
-   External/SPEC/CINT2000/253.perlbmk \
-   External/SPEC/CINT2000/254.gap \
-   External/SPEC/CINT2000/300.twolf
+   MultiSource/Benchmarks/Olden/bh \
+   #MultiSource/Benchmarks/Olden \
+   #MultiSource/Benchmarks/SciMark2-C/scimark2 \
+   #External/Povray \
+   #External/FPGrowth \
+   #External/Namd \
+   #External/SPEC/CINT2000/164.gzip \
+   #External/SPEC/CINT2000/175.vpr \
+   #External/SPEC/CINT2000/176.gcc \
+   #External/SPEC/CINT2000/252.eon \
+   #External/SPEC/CINT2000/253.perlbmk \
+   #External/SPEC/CINT2000/254.gap \
+   #External/SPEC/CINT2000/300.twolf
+
 
 NORMAL_PROBLEM_SIZE_DIRS := \
    $(addprefix $(LLVM_OBJ_ROOT)/projects/llvm-test/,$(NORMAL_PROBLEM_SIZE_DIRS))

Modified: poolalloc/branches/release_26/test/TEST.poolalloc.Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/branches/release_26/test/TEST.poolalloc.Makefile?rev=97820&r1=97479&r2=97820&view=diff
==============================================================================
--- poolalloc/branches/release_26/test/TEST.poolalloc.Makefile (original)
+++ poolalloc/branches/release_26/test/TEST.poolalloc.Makefile Fri Mar  5 14:19:05 2010
@@ -19,21 +19,22 @@
 CURDIR  := $(shell cd .; pwd)
 PROGDIR := $(shell cd $(LLVM_SRC_ROOT)/projects/test-suite; pwd)/
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
-PADIR   := /home/andrewl/Research/llvm/projects/poolalloc
+#PADIR   := /home/andrewl/Research/llvm/projects/poolalloc
+PADIR   := $(LLVM_OBJ_ROOT)/projects/poolalloc
 
 # Bits of runtime to improve analysis
-PA_PRE_RT := $(PADIR)/Release/lib/libpa_pre_rt.bca
+PA_PRE_RT := $(PADIR)/$(CONFIGURATION)/lib/libpa_pre_rt.bca
 
 # Pool allocator pass shared object
-PA_SO    := $(PADIR)/Debug/lib/libpoolalloc$(SHLIBEXT)
-DSA_SO   := $(PADIR)/Debug/lib/libLLVMDataStructure$(SHLIBEXT)
-ASSIST_SO := $(PADIR)/Debug/lib/libAssistDS$(SHLIBEXT)
+PA_SO    := $(PADIR)/$(CONFIGURATION)/lib/libpoolalloc$(SHLIBEXT)
+DSA_SO   := $(PADIR)/$(CONFIGURATION)/lib/libLLVMDataStructure$(SHLIBEXT)
+ASSIST_SO := $(PADIR)/$(CONFIGURATION)/lib/libAssistDS$(SHLIBEXT)
 
 # Pool allocator runtime library
-#PA_RT    := $(PADIR)/Debug/lib/libpoolalloc_fl_rt.bc
+#PA_RT    := $(PADIR)/$(CONFIGURATION)/lib/libpoolalloc_fl_rt.bc
 #PA_RT_O  := $(PROJECT_DIR)/lib/$(CONFIGURATION)/poolalloc_rt.o
-PA_RT_O  := $(PADIR)/Debug/lib/poolalloc_rt.o
-#PA_RT_O  := $(PROJECT_DIR)/lib/Release/poolalloc_fl_rt.o
+PA_RT_O  := $(PADIR)/$(CONFIGURATION)/lib/libpoolalloc_rt.a
+#PA_RT_O  := $(PROJECT_DIR)/lib/$(CONFIGURATION)/poolalloc_fl_rt.o
 
 # Command to run opt with the pool allocator pass loaded
 OPT_PA := $(LOPT) -load $(DSA_SO) -load $(PA_SO)