Merge pull request gtcasl#6 from sixshotx/laddr

KitFox Framework & 3D HMC Integration

Author: sixshotx

.gitignore

@@ -2,11 +2,18 @@
 *.a
 *.status
 *.log
+DBG_LOG*
+aclocal.m4
 .deps
 dep
 autom4te.cache
+depcomp
+install-sh
+missing
+compile
+Makefile.in
 Makefile
+configure
 smp_llp
 smp_l1l2
-DBG_LOG0
 

.travis.yml

@@ -18,6 +18,7 @@ addons:
         - qemu-user
         - qemu
 before_install:
+    - sudo apt-get -qq update
     - sudo apt-get -y build-dep qemu linux-meta
     - export MANIFOLD_DIR=`pwd`
     - git clone https://github.com/gtcasl/qsim
@@ -37,11 +38,25 @@ before_install:
     - cd $QSIM_PREFIX
     - make release install
     - cd ..
+    - wget http://manifold.gatech.edu/wp-content/uploads/2016/10/kitfox-v1.1.tar.gz
+    - tar xzvf kitfox-v1.1.tar.gz
+    - cd kitfox-v1.1
+    - sudo apt-get -y install flex bison
+    - make mcpat;make 3dice
+    - make kitfox 
+    - export KITFOX_PREFIX=`pwd`
+    - cd ..
 script:
-    - ./configure QSIMINC=${QSIM_PREFIX}/include
+    - autoreconf -siv
+    - ./configure QSIMINC=${QSIM_PREFIX}/include KITFOXINC=${KITFOX_PREFIX}
     - make
     - cd ${MANIFOLD_DIR}/simulator/smp/QsimProxy
+    - make -f Makefile.kitfox
+    - cd ${MANIFOLD_DIR}
+    - ./configure QSIMINC=${QSIM_PREFIX}/include --without-kitfox
     - make
+    - cd ${MANIFOLD_DIR}/simulator/smp/QsimProxy
+    - make -f Makefile
 after_failure:
     - cat ${MANIFOLD_DIR}/config.log
 compiler:

Makefile.am

@@ -1,9 +1,9 @@
 MAINTAINERCLEANFILES= aclocal.m4 config.log config.status configure depcomp \
-		    Makefile.in INSTALL install-sh missing 
+			Makefile.in INSTALL install-sh missing
 
-SUBDIRS = kernel  uarch  models/cache/mcp-cache  models/cache/simple-cache  models/memory/CaffDRAM  models/memory/DRAMSim2  models/network/iris  models/processor/spx  models/cross/mcp_cache-iris  models/qsim/interrupt_handler  models/qsim/proxy
-#models/memory/simple-mc  
-#models/network/simple-net  
+SUBDIRS = kernel  uarch  models/cache/mcp-cache  models/cache/simple-cache  models/memory/CaffDRAM  models/memory/DRAMSim2  models/network/iris  models/processor/spx  models/cross/mcp_cache-iris  models/qsim/interrupt_handler  models/qsim/proxy models/kitfox/proxy
+#models/memory/simple-mc
+#models/network/simple-net
 
 EXTRA_DIST = util/traceGen simulator/smp simulator/smp2 doc/doxygen