[llvm-commits] [poolalloc] r132094 - in /poolalloc/trunk: runtime/FL2Allocator/Makefile test/Makefile test/pa/regression/2010-09-14-Fptr.c test/pa/regression/2010-09-14-Fptr_helper.c

[Arushi Aggarwal]

Author: aggarwa4
Date: Wed May 25 17:48:18 2011
New Revision: 132094

URL: http://llvm.org/viewvc/llvm-project?rev=132094&view=rev
Log:
1. Build a bytecode library for poolalloc runtime
2. Add a link tool for pa
3. For tests that run poolallocated versions of the program,
link the library

Modified:
    poolalloc/trunk/runtime/FL2Allocator/Makefile
    poolalloc/trunk/test/Makefile
    poolalloc/trunk/test/pa/regression/2010-09-14-Fptr.c
    poolalloc/trunk/test/pa/regression/2010-09-14-Fptr_helper.c

Modified: poolalloc/trunk/runtime/FL2Allocator/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/runtime/FL2Allocator/Makefile?rev=132094&r1=132093&r2=132094&view=diff
==============================================================================
--- poolalloc/trunk/runtime/FL2Allocator/Makefile (original)
+++ poolalloc/trunk/runtime/FL2Allocator/Makefile Wed May 25 17:48:18 2011
@@ -1,5 +1,6 @@
 LEVEL = ../..
 LIBRARYNAME=poolalloc_rt
+BYTECODE_LIBRARY=1
 
 #
 # Build shared libraries on all platforms except Cygwin and MingW (which do

Modified: poolalloc/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/Makefile?rev=132094&r1=132093&r2=132094&view=diff
==============================================================================
--- poolalloc/trunk/test/Makefile (original)
+++ poolalloc/trunk/test/Makefile Wed May 25 17:48:18 2011
@@ -427,8 +427,9 @@
 ADSAOPT := $(PROJ_OBJ_ROOT)/test/tools/adsaopt
 PAOPT := $(PROJ_OBJ_ROOT)/test/tools/paopt
 TC_LINK := $(PROJ_OBJ_ROOT)/test/tools/tc-link
+PA_LINK := $(PROJ_OBJ_ROOT)/test/tools/pa-link
 
-TOOLS= $(DSAOPT) $(PAOPT) $(ADSAOPT) $(TC_LINK)
+TOOLS= $(DSAOPT) $(PAOPT) $(ADSAOPT) $(TC_LINK) $(PA_LINK)
 
 #wrapper script for 'opt' so we can avoid manually loading the dsa lib
 $(DSAOPT):
@@ -453,6 +454,7 @@
 	@chmod +x $@.tmp
 	@mv $@.tmp $@
 
+#wrapper script for llvm-ld that links the type checking runtime
 $(TC_LINK):
 	@mkdir -p `dirname $@`
 	@echo "#!/bin/sh" > $@.tmp
@@ -460,6 +462,14 @@
 	@chmod +x $@.tmp
 	@mv $@.tmp $@
 
+#wrapper script for llvm-ld that links the poolalloc runtime
+$(PA_LINK):
+	@mkdir -p `dirname $@`
+	@echo "#!/bin/sh" > $@.tmp
+	@echo 'llvm-ld -link-as-library $$@ $(PROJ_OBJ_ROOT)/$(CONFIGURATION)/lib/libpoolalloc_rt.bca ' >> $@.tmp
+	@chmod +x $@.tmp
+	@mv $@.tmp $@
+
 lit.site.cfg: $(PROJ_SRC_ROOT)/test/lit.site.cfg.in
 	@echo "Making LLVM 'lit.site.cfg' file..."
 	@sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \

Modified: poolalloc/trunk/test/pa/regression/2010-09-14-Fptr.c
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/pa/regression/2010-09-14-Fptr.c?rev=132094&r1=132093&r2=132094&view=diff
==============================================================================
--- poolalloc/trunk/test/pa/regression/2010-09-14-Fptr.c (original)
+++ poolalloc/trunk/test/pa/regression/2010-09-14-Fptr.c Wed May 25 17:48:18 2011
@@ -2,7 +2,8 @@
  * Build this file into bitcode and run poolalloc on it
  * RUN: llvm-gcc -O0 %s --emit-llvm -c -o %t.bc
  * RUN: paopt %t.bc -paheur-AllButUnreachableFromMemory -poolalloc -o %t.pa.bc 2>&1
- * RUN: llc %t.pa.bc -o %t.pa.s
+ * RUN: pa-link %t.pa.bc -o %t.pa.ld.bc
+ * RUN: llc %t.pa.ld.bc -o %t.pa.s
  * RUN: llvm-gcc %t.pa.s -o %t.pa
  *
  * Build the program without poolalloc:

Modified: poolalloc/trunk/test/pa/regression/2010-09-14-Fptr_helper.c
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/pa/regression/2010-09-14-Fptr_helper.c?rev=132094&r1=132093&r2=132094&view=diff
==============================================================================
--- poolalloc/trunk/test/pa/regression/2010-09-14-Fptr_helper.c (original)
+++ poolalloc/trunk/test/pa/regression/2010-09-14-Fptr_helper.c Wed May 25 17:48:18 2011
@@ -5,7 +5,8 @@
  * Build this file into bitcode and run poolalloc on it
  * RUN: llvm-gcc -O0 %s --emit-llvm -c -o %t.bc
  * RUN: paopt %t.bc -paheur-AllButUnreachableFromMemory -poolalloc -o %t.pa.bc 2>&1
- * RUN: llc %t.pa.bc -o %t.pa.s
+ * RUN: pa-link %t.pa.bc -o %t.pa.ld.bc
+ * RUN: llc %t.pa.ld.bc -o %t.pa.s
  * RUN: llvm-gcc %t.pa.s -o %t.pa
  *
  * Build the program without poolalloc: