Added ChangeLog, Improved lua-compiler & lua-cross-compiler.

Added -mcpu option to *-compiler scripts.
Changed -arch to -target option.
Embed the install prefix into lua-compiler so it can find liblua_main.a
Added gen_changelog.sh script to generate ChangeLog from svn history.


git-svn-id: http://llvm-lua.googlecode.com/svn/trunk@103 f87b780f-1855-0410-a4d3-fd11cda3f415

Author: [email protected]

AUTHORS

@@ -0,0 +1 @@
+[email protected]:Robert G. Jakabosky <[email protected]>

ChangeLog

@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+
+svn2cl --authors=AUTHORS --break-before-msg --group-by-day -o ChangeLog
+

gen_changelog.sh

@@ -202,7 +202,8 @@ if(CROSS_COMPILE)
 	set_target_properties(llvm-luac PROPERTIES OUTPUT_NAME ${CROSS_TRIPLE}-llvm-luac)
 	configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lua-cross-compiler.in" "${LUA_COMPILER}" @ONLY)
 else(CROSS_COMPILE)
-	set(LUA_COMPILER "lua-compiler")
+	set(LUA_COMPILER "${CMAKE_CURRENT_BINARY_DIR}/lua-compiler")
+	configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lua-compiler.in" "${LUA_COMPILER}" @ONLY)
 endif(CROSS_COMPILE)
 
 #

llvm-lua/CMakeLists.txt

@@ -1,18 +1,30 @@
 #!/usr/bin/env bash
 #
 
+# path to lua-compiler
+DIR=`realpath $0`
+DIR=`dirname $DIR`
+
 CC=gcc
 LIBTOOL="libtool --tag=CC --silent"
 RPATH=`pwd`
 LLVM_LUAC="./llvm-luac"
+PREFIX="@CMAKE_INSTALL_PREFIX@"
+
+# find llvm-luac
+if [[ ! -x "$LLVM_LUAC" ]]; then
+	LLVM_LUAC="$DIR/llvm-luac"
+fi
 if [[ ! -x "$LLVM_LUAC" ]]; then
 	LLVM_LUAC=`which llvm-luac`
 fi
 
-#ARCH=i686
-#ARCH=pentium4
-#ARCH=athlon64
-FORCE_ARCH="0"
+TARGET=
+FORCE_TARGET="0"
+CPU=i686
+#CPU=pentium4
+#CPU=athlon64
+FORCE_CPU="0"
 FILE=
 FILES=""
 OUTPUT_FILE=""
@@ -40,17 +52,19 @@ OPTIONS:
                        info and gcc debug symbols are enabled.
   -keep-tmps       - Don't delete temp. files generated by intermediate stages.  Use only
                        for debuging generated code or if you are really curious!
-  -arch=<arch>     - <arch> is passed to gcc as '-march=<arch>'
+  -target=<target> - <target> is passed to llc as '-target=<target>', see llc --version for targets
+  -mcpu=<arch>     - <cpu> is passed to gcc as '-march=<cpu>'
   -mode=<mode>     - Switch how LLVM bitcode is generated and compiled into native code.
-                   -   cbe - compile Lua script into C-code from LLVM bitcode, then use
-                         gcc to compile to native executable binary.
                    -   full_bc - (default mode) compiles Lua scripts into LLVM bitcode
                          linked with bitcode liblua_main.bc then converted to assembly
                          before being compiled with gcc to a native executable.
-                   -   c - compiles Lua scripts into C-code.
-                   -   ll - compiles Lua scripts into LLVM IR code.
                    -   lua_mod - Only used by the '-lua-module' option.  Don't use
                          it directly.
+                   The following modes are for testing only:
+                   -   cbe - compile Lua script into C-code from LLVM bitcode, then use
+                         gcc to compile to native executable binary.
+                   -   c - compiles Lua scripts into C-code.
+                   -   ll - compiles Lua scripts into LLVM IR code.
   -******          - All other options passed to 'llvm-luac'.  See below for a list of
                        options supported by 'llvm-luac'.
 
@@ -78,7 +92,8 @@ for arg in "$@" ; do
 	-debug)  DEBUG="1" ;;
 	-keep-tmps)  KEEP_TMPS="1" ;;
 	-mode=*)  MODE=` echo "$arg" | sed -e 's/-mode=//'` ;;
-	-arch=*)  FORCE_ARCH="1"; ARCH=` echo "$arg" | sed -e 's/-arch=//'` ;;
+	-target=*)  FORCE_TARGET="1"; TARGET=` echo "$arg" | sed -e 's/-target=//'` ;;
+	-mcpu=*)  FORCE_CPU="1"; CPU=` echo "$arg" | sed -e 's/-mcpu=//'` ;;
 	-help|--help|-h)  usage ;;
 	-version|--version|-v)  version ;;
 	-o|-L)  CONSUME="$arg" ;;
@@ -113,35 +128,36 @@ if [[ $DEBUG == "1" ]]; then
 	#CFLAGS=" -ggdb -O3 -fomit-frame-pointer -pipe -Wall "
 	OPT_FLAGS=" -disable-opt "
 	LLC_FLAGS=" "
-	if [[ ! -z $ARCH && $FORCE_ARCH == "1" ]]; then
-		CFLAGS=" -march=$ARCH $CFLAGS "
+	if [[ ! -z $CPU && $FORCE_CPU == "1" ]]; then
+		CFLAGS=" -march=$CPU $CFLAGS "
 	fi
 else
 	LUA_FLAGS=" -O3 -s "
 	#LUA_FLAGS=" -O3 -g "
 	#CFLAGS=" -ggdb -O3 -fomit-frame-pointer -pipe -Wall "
 	CFLAGS=" -O3 -fomit-frame-pointer -pipe "
-	if [[ ! -z $ARCH ]]; then
-		CFLAGS=" -march=$ARCH $CFLAGS "
+	if [[ ! -z $CPU ]]; then
+		CFLAGS=" -march=$CPU $CFLAGS "
 	fi
 	OPT_FLAGS=" -O3 -std-compile-opts -tailcallelim -tailduplicate "
 	LLC_FLAGS=" -tailcallopt "
 fi
-if [[ ! -z $ARCH && $FORCE_ARCH == "1" ]]; then
-	LLC_FLAGS=" -march=$ARCH $LLC_FLAGS "
+if [[ ! -z $CPU && $FORCE_CPU == "1" ]]; then
+	LLC_FLAGS=" -mcpu=$CPU $LLC_FLAGS "
 fi
 
 if [[ $MODE == "cbe" ]]; then
 	EXTRA_ARGS="$EXTRA_ARGS -no-main "
 
-	# find path to liblua_main.a
-	# TODO: find a better way.
-	DIR=`dirname $LLVM_LUAC`
-	LIBS="$LIBS -L$DIR -L$DIR/../lib "
-	DIR=`dirname $0`
-	LIBS="$LIBS -L$DIR -L$DIR/../lib "
+	# path to liblua_main.a
+	LIBS="$LIBS -L$DIR -L$DIR/../lib -L$PREFIX/lib "
 elif [[ $MODE == "c" ]]; then
 	EXTRA_ARGS="$EXTRA_ARGS -no-main "
+else
+	# if mode not "cbe" or "c"
+	if [[ ! -z $TARGET && $FORCE_TARGET == "1" ]]; then
+		LLC_FLAGS=" -march=$TARGET $LLC_FLAGS "
+	fi
 fi
 
 #
@@ -158,27 +174,38 @@ TMPS="${FILE}.bc"
 case "$MODE" in
 	cbe)
 		TMPS="$TMPS ${FILE}_opt.bc ${FILE}_run.c"
-		opt $OPT_FLAGS -f -o ${FILE}_opt.bc ${FILE}.bc && \
-		llc $LLC_FLAGS -f --march=c -o ${FILE}_run.c ${FILE}_opt.bc && \
+		echo "opt $OPT_FLAGS -f -o ${FILE}_opt.bc ${FILE}.bc"
+		opt $OPT_FLAGS -f -o ${FILE}_opt.bc ${FILE}.bc
+		echo "llc $LLC_FLAGS -f --march=c -o ${FILE}_run.c ${FILE}_opt.bc"
+		llc $LLC_FLAGS -f --march=c -o ${FILE}_run.c ${FILE}_opt.bc
+		echo "$CC $CFLAGS $LIBS -o ${OUTPUT_FILE} ${FILE}_run.c -llua_main -lm -ldl"
 		$CC $CFLAGS $LIBS -o ${OUTPUT_FILE} ${FILE}_run.c -llua_main -lm -ldl
 		;;
 	c)
 		TMPS="$TMPS ${FILE}_opt.bc"
-		opt $OPT_FLAGS -f -o ${FILE}_opt.bc ${FILE}.bc && \
+		echo "opt $OPT_FLAGS -f -o ${FILE}_opt.bc ${FILE}.bc"
+		opt $OPT_FLAGS -f -o ${FILE}_opt.bc ${FILE}.bc
+		echo "llc $LLC_FLAGS -f --march=c -o ${OUTPUT_FILE} ${FILE}_opt.bc"
 		llc $LLC_FLAGS -f --march=c -o ${OUTPUT_FILE} ${FILE}_opt.bc
 		;;
 	ll)
+		echo "llvm-dis -f -o ${OUTPUT_FILE} ${FILE}.bc"
 		llvm-dis -f -o ${OUTPUT_FILE} ${FILE}.bc
 		;;
 	full_bc)
 		TMPS="$TMPS ${FILE}_opt.bc ${FILE}_run.bc ${FILE}_run.s"
-		opt $OPT_FLAGS -f -o ${FILE}_run.bc ${FILE}.bc && \
-		llc $LLC_FLAGS -f -filetype=asm -o ${FILE}_run.s ${FILE}_run.bc && \
+		echo "opt $OPT_FLAGS -f -o ${FILE}_run.bc ${FILE}.bc"
+		opt $OPT_FLAGS -f -o ${FILE}_run.bc ${FILE}.bc
+		echo "llc $LLC_FLAGS -f -filetype=asm -o ${FILE}_run.s ${FILE}_run.bc"
+		llc $LLC_FLAGS -f -filetype=asm -o ${FILE}_run.s ${FILE}_run.bc
+		echo "$CC $CFLAGS -o ${OUTPUT_FILE} ${FILE}_run.s -lm -ldl"
 		$CC $CFLAGS -o ${OUTPUT_FILE} ${FILE}_run.s -lm -ldl
 		;;
 	lua_mod)
 		TMPS="$TMPS ${FILE}_opt.bc ${FILE}_mod.s ${FPATH}/${FNAME}.lo ${FPATH}/lib${FNAME}.la"
-		opt $OPT_FLAGS -f -o ${FILE}_opt.bc ${FILE}.bc && \
+		echo "opt $OPT_FLAGS -f -o ${FILE}_opt.bc ${FILE}.bc"
+		opt $OPT_FLAGS -f -o ${FILE}_opt.bc ${FILE}.bc
+		echo "llc $LLC_FLAGS -f -filetype=asm -o ${FILE}_mod.s ${FILE}_opt.bc"
 		llc $LLC_FLAGS -f -filetype=asm -o ${FILE}_mod.s ${FILE}_opt.bc || {
 			echo "Error compiling LLVM bitcode to assembly code."
 			exit 1;

llvm-lua/lua-compiler renamed to llvm-lua/lua-compiler.in

@@ -1,15 +1,25 @@
 #!/usr/bin/env bash
 #
 
+# path to lua-cross-compiler
+DIR=`realpath $0`
+DIR=`dirname $DIR`
+
 CC=@CROSS_TRIPLE@-gcc
 LLVM_LUAC="./@CROSS_TRIPLE@-llvm-luac"
+
+# find llvm-luac cross-compiler
+if [[ ! -x "$LLVM_LUAC" ]]; then
+	LLVM_LUAC="$DIR/@CROSS_TRIPLE@-llvm-luac"
+fi
 if [[ ! -x "$LLVM_LUAC" ]]; then
 	LLVM_LUAC=`which @CROSS_TRIPLE@-llvm-luac`
 fi
 
 ARCH=@CROSS_ARCH@
 CPU=@CROSS_CPU@
 MODULE="0"
+NO_ASSEMBLE="0"
 FILE=lua-native-out
 FILES=""
 DEBUG="0"
@@ -28,6 +38,7 @@ function usage() {
 OPTIONS:
   -lua-module      - Compile Lua script into a loadable module instead of a standalone
                        executable.
+  -no-assemble     - Only compile to native Assembly code or C-code, don't compile to machine code.
   -debug           - Turns off all optimizations and turns on debug info.  Both Lua debug
                        info and gcc debug symbols are enabled.
   -keep-tmps       - Don't delete temp. files generated by intermediate stages.  Use only
@@ -45,22 +56,44 @@ llvm-luac '-help' output:
 }
 
 # parse command line parameters.
+CONSUME=""
 for arg in "$@" ; do
+	case "$CONSUME" in
+	-o)  OUTPUT_FILE=` echo "$arg" | sed -e 's/-o=//'` ;;
+	-L)  EXTRA_ARGS="$EXTRA_ARGS -L $arg" ;;
+	esac
+	if [[ ! -z "$CONSUME" ]]; then
+		CONSUME=""
+		continue
+	fi
 	case "$arg" in
-	-lua-module*)  MODULE="1"; EXTRA_ARGS="$EXTRA_ARGS $arg" ;;
+	-lua-mod*)  MODULE="1"; EXTRA_ARGS="$EXTRA_ARGS $arg" ;;
 	-debug)  DEBUG="1" ;;
+	-no-assemble)  NO_ASSEMBLE="1" ;;
 	-keep-tmps)  KEEP_TMPS="1" ;;
 	-mode=*)  MODE=` echo "$arg" | sed -e 's/-mode=//'` ;;
 	-help|--help|-h)  usage ;;
 	-version|--version|-v)  version ;;
+	-o|-L)  CONSUME="$arg" ;;
+	-L*)  EXTRA_ARGS="$EXTRA_ARGS $arg" ;;
 	-*)  EXTRA_ARGS="$EXTRA_ARGS $arg" ;;
 	*) FILE=${arg/.lua/}; FILES="$FILES $arg" ;;
 	esac
 done
 
-# get source file's path & filename.
-FPATH=`dirname ${FILE}`
-FNAME=`basename ${FILE}`
+# find the mode's output file extension.
+OUTPUT_EXT=""
+MODE_OUT=""
+case "$MODE" in
+	cbe) OUTPUT_EXT=".c" ;;
+	asm) OUTPUT_EXT=".s" ;;
+esac
+if [[ -z "$OUTPUT_FILE" ]]; then
+	OUTPUT_FILE="${FILE}${OUTPUT_EXT}"
+else
+	FILE=${OUTPUT_FILE}
+fi
+MODE_OUT="${FILE}${OUTPUT_EXT}"
 
 # select debug/optimize parameters.
 if [[ $DEBUG == "1" ]]; then
@@ -72,7 +105,7 @@ else
 	OPT_FLAGS=" -O3 -std-compile-opts -tailcallelim -tailduplicate "
 	LLC_FLAGS=" -tailcallopt "
 fi
-LLC_FLAGS=" -march=$ARCH -mcpu=$CPU $LLC_FLAGS "
+LLC_FLAGS=" -mcpu=$CPU $LLC_FLAGS "
 
 #
 # run llvm-luac to compile Lua source/bytecode to LLVM bitcode.
@@ -84,36 +117,43 @@ $LLVM_LUAC $EXTRA_ARGS $LUA_FLAGS -bc -o ${FILE}.bc ${FILES} || {
 }
 TMPS="${FILE}.bc"
 
-MODE_OUT=""
 # use one of the compile modes.
 case "$MODE" in
 	cbe)
 		TMPS="$TMPS ${FILE}_opt.bc"
 		echo "opt $OPT_FLAGS -f -o ${FILE}_opt.bc ${FILE}.bc"
 		opt $OPT_FLAGS -f -o ${FILE}_opt.bc ${FILE}.bc
-		echo "llc -f -march=c -o ${FILE}.c ${FILE}_opt.bc"
-		MODE_OUT=${FILE}.c
-		llc -f -march=c -o ${MODE_OUT} ${FILE}_opt.bc
+		echo "llc $LLC_FLAGS -f -march=c -o ${FILE}.c ${FILE}_opt.bc"
+		llc $LLC_FLAGS -f -march=c -o ${MODE_OUT} ${FILE}_opt.bc
 		;;
 	asm)
 		TMPS="$TMPS ${FILE}_opt.bc"
 		echo "opt $OPT_FLAGS -f -o ${FILE}_opt.bc ${FILE}.bc"
 		opt $OPT_FLAGS -f -o ${FILE}_opt.bc ${FILE}.bc
-		echo "llc $LLC_FLAGS -f -filetype=asm -o ${FILE}.s ${FILE}_opt.bc"
-		MODE_OUT=${FILE}.s
-		llc $LLC_FLAGS -f -filetype=asm -o ${MODE_OUT} ${FILE}_opt.bc
+		echo "llc -march=$ARCH $LLC_FLAGS -f -filetype=asm -o ${FILE}.s ${FILE}_opt.bc"
+		llc -march=$ARCH $LLC_FLAGS -f -filetype=asm -o ${MODE_OUT} ${FILE}_opt.bc
 		;;
 	*)
 		echo "Invalid compile mode: $MODE"
 		;;
 esac
 
 # compile to stand-alone
-if [[ $MODULE == "0" ]]; then
-	${CC} -o ${FILE} ${MODE_OUT} -lm -ldl && \
+if [[ $MODULE == "0" && $NO_ASSEMBLE == "0" ]]; then
+	echo "${CC} -o ${OUTPUT_FILE} ${MODE_OUT} -lm -ldl"
+	${CC} -o ${OUTPUT_FILE} ${MODE_OUT} -lm -ldl && \
 	TMPS="$TMPS ${MODE_OUT}"
 fi
 
+# keep assembly/c-code output.
+if [[ $NO_ASSEMBLE == "1" && $MODE_OUT != $OUTPUT_FILE ]]; then
+	echo "1 no-asm=$NO_ASSEMBLE, mode_out=$MODE_OUT, out=$OUTPUT_FILE"
+	echo "mv $MODE_OUT $OUTPUT_FILE"
+	mv $MODE_OUT $OUTPUT_FILE
+else
+	echo "2 no-asm=$NO_ASSEMBLE, mode_out=$MODE_OUT, out=$OUTPUT_FILE"
+fi
+
 if [[ $KEEP_TMPS == "0" ]]; then
 	rm -f $TMPS
 fi

llvm-lua/lua-cross-compiler.in

@@ -102,10 +102,9 @@ static int doargs(int argc, char* argv[]) {
     else if (IS("-bc")) {		/* output LLVM bitcode */
       llvm_bitcode=1;
       dumping=0;
-    } else if (IS("-L")) {	/*  */
+    } else if (IS("-L")) {	/* preload library */
       if (preloads >= MAX_PRELOADS) usage(LUA_QL("-L") " too many preloads");
       preload_libs[preloads]=argv[++i];
-      if (IS("-")) preload_libs[preloads]=NULL;
       preloads++;
     } else if (IS("-l"))		/* list */
       ++listing;

llvm-lua/lua_compiler.c

@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+
+for script in `ls tests/*.lua`; do
+	echo "run test: $script"
+	llvm-lua -g -O0 $script >/dev/null
+	#llvm-lua -g -O0 $script
+	#lua $script
+done
+