Added modifications to Makefile to build decuda_to_ptxplus and download/patch Decuda. Modified config file for ptxplus regression so it runs the converted ptxplus.

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 8002]

2 files changed, 16 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index a9469ec..29225ae 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,8 @@ endif
 ifneq  ($(NVOPENCL_LIBDIR),)
 	TARGETS += lib/libOpenCL.so
 endif
+	TARGETS += decuda_to_ptxplus/decuda_to_ptxplus
+	TARGETS += decuda
 
 gpgpusim: $(TARGETS)
 
@@ -142,6 +144,12 @@ gpgpusimlib: cuda-sim gpgpu-sim_uarch intersim
 opencllib: cuda-sim
 	$(MAKE) -C ./libopencl/
 
+decuda_to_ptxplus/decuda_to_ptxplus: 
+	$(MAKE) -C ./decuda_to_ptxplus/
+
+decuda:
+	./getDecuda/getDecuda.sh
+
 all:
 	$(MAKE) gpgpusim
 
@@ -157,4 +165,5 @@ endif
 	$(MAKE) clean -C ./src/cuda-sim/
 	$(MAKE) clean -C ./src/gpgpu-sim/
 	$(MAKE) clean -C ./src/
+	$(MAKE) clean -C ./decuda_to_ptxplus/
 	rm -rf ./lib/*.so*
diff --git a/getDecuda/getDecuda.sh b/getDecuda/getDecuda.sh
index a4a7db9..381724b 100755
--- a/getDecuda/getDecuda.sh
+++ b/getDecuda/getDecuda.sh
@@ -1,10 +1,13 @@
 # This script downloads the latest version of decuda from http://github.com/laanwj/decuda, untars it and patches it.
-# Currently hardcoded to work with only decuda 0.4.2.
+# Only works with decuda 0.4.2.
 
 # decuda.patch must be in the same folder as getDecuda.sh
 
-wget -q  http://github.com/laanwj/decuda/tarball/master
+cd ./getDecuda
+wget --no-check-certificate  http://github.com/laanwj/decuda/tarball/master
 tar -xf ./laanwj-decuda-c30bd17.tar.gz
-mv laanwj-decuda-c30bd17 ../decuda
-patch -s -d ../decuda < ./decuda.patch
+mv laanwj-decuda-c30bd17 decuda
+patch -d ./decuda < ./decuda.patch
 rm ./laanwj-decuda-c30bd17.tar.gz
+mv decuda ../decuda
+cd ..