From 7edfd64a2b39222d7424d2b6c0f14a68fe1903ed Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Thu, 31 May 2012 23:23:58 -0800 Subject: - Update README file to be slightly more user friendly (i.e., try not to imply user should bugger off and stop asking developer for help) - Remove ridiculously long and cryptic comment from setup_environment. Most people will use CUDA_INSTALL_PATH. - Remove decuda targets from Makefile - Add check to Makefile to insist that setup_environment was run first - Add version file (eliminate redundancy) and remove version strings from src/cuda-sim/cuda-sim.cc [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 12874] --- Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5edc049..0c7891d 100644 --- a/Makefile +++ b/Makefile @@ -60,10 +60,18 @@ else ifeq ($(NVOPENCL_INCDIR),) else TARGETS += $(SIM_LIB_DIR)/libOpenCL.so endif -# TARGETS += decuda_to_ptxplus/decuda_to_ptxplus TARGETS += cuobjdump_to_ptxplus/cuobjdump_to_ptxplus -gpgpusim: makedirs $(TARGETS) +.PHONY: check_setup_environment +gpgpusim: check_setup_environment makedirs $(TARGETS) + + +check_setup_environment: + @if [ ! -n "$(GPGPUSIM_ROOT)" ]; then \ + echo "ERROR *** run 'source setup_environment' before 'make'; please see README."; \ + exit 101; \ + else true; \ + fi no_opencl_support: @echo "Warning: gpgpu-sim is building without opencl support. Make sure NVOPENCL_LIBDIR and NVOPENCL_INCDIR are set" @@ -126,10 +134,6 @@ opencllib: cuda-sim $(MAKE) -C ./libopencl/ depend $(MAKE) -C ./libopencl/ -decuda_to_ptxplus/decuda_to_ptxplus: - $(MAKE) -C ./decuda_to_ptxplus/ depend - $(MAKE) -C ./decuda_to_ptxplus/ - .PHONY: cuobjdump_to_ptxplus/cuobjdump_to_ptxplus cuobjdump_to_ptxplus/cuobjdump_to_ptxplus: $(MAKE) -C ./cuobjdump_to_ptxplus/ depend @@ -143,7 +147,6 @@ makedirs: if [ ! -d $(SIM_OBJ_FILES_DIR)/gpgpu-sim ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/gpgpu-sim; fi; if [ ! -d $(SIM_OBJ_FILES_DIR)/libopencl ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/libopencl; fi; if [ ! -d $(SIM_OBJ_FILES_DIR)/intersim ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/intersim; fi; - if [ ! -d $(SIM_OBJ_FILES_DIR)/decuda_to_ptxplus ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/decuda_to_ptxplus; fi; all: $(MAKE) gpgpusim @@ -166,7 +169,6 @@ endif $(MAKE) clean -C ./src/cuda-sim/ $(MAKE) clean -C ./src/gpgpu-sim/ $(MAKE) clean -C ./src/ -# $(MAKE) clean -C ./decuda_to_ptxplus/ $(MAKE) clean -C ./cuobjdump_to_ptxplus/ rm -rf $(SIM_LIB_DIR) rm -rf $(SIM_OBJ_FILES_DIR) -- cgit v1.3