diff options
| author | Andrew M. B. Boktor <[email protected]> | 2012-05-02 12:33:33 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:19:06 -0700 |
| commit | 6bd512ea5b8cc098903fcb2dd802e652bbed2cb4 (patch) | |
| tree | dac4feadd50bdaedd53099e21d26342123a5059a /Makefile | |
| parent | d1cd69a100116dd8192115c49381d43faa355220 (diff) | |
Moving things where they belong
cubojdump.l/.y are used to parse the output of cuobjdump, and thus should be part of libcuda not cuobjdump_to_ptxplus
Included are also modifications to Makefiles
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 12255]
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -60,7 +60,8 @@ else ifeq ($(NVOPENCL_INCDIR),) else TARGETS += $(SIM_LIB_DIR)/libOpenCL.so endif - TARGETS += decuda_to_ptxplus/decuda_to_ptxplus +# TARGETS += decuda_to_ptxplus/decuda_to_ptxplus + TARGETS += cuobjdump_to_ptxplus/cuobjdump_to_ptxplus gpgpusim: makedirs $(TARGETS) @@ -75,8 +76,6 @@ $(SIM_LIB_DIR)/libcudart.so: $(LIBS) cudalib $(SIM_OBJ_FILES_DIR)/gpgpu-sim/*.o \ $(SIM_OBJ_FILES_DIR)/intersim/*.o \ $(SIM_OBJ_FILES_DIR)/*.o -lm -lz -lGL -pthread \ - $(GPGPUSIM_ROOT)/cuobjdump_to_ptxplus/cuobjdump_parser.o \ - $(GPGPUSIM_ROOT)/cuobjdump_to_ptxplus/cuobjdump_lexer.o \ -o $(SIM_LIB_DIR)/libcudart.so if [ ! -f $(SIM_LIB_DIR)/libcudart.so.2 ]; then ln -s libcudart.so $(SIM_LIB_DIR)/libcudart.so.2; fi if [ ! -f $(SIM_LIB_DIR)/libcudart.so.3 ]; then ln -s libcudart.so $(SIM_LIB_DIR)/libcudart.so.3; fi @@ -90,8 +89,6 @@ $(SIM_LIB_DIR)/libcudart.dylib: $(LIBS) cudalib $(SIM_OBJ_FILES_DIR)/gpgpu-sim/*.o \ $(SIM_OBJ_FILES_DIR)/intersim/*.o \ $(SIM_OBJ_FILES_DIR)/*.o -lm -lz -pthread \ - $(GPGPUSIM_ROOT)/cuobjdump_to_ptxplus/cuobjdump_parser.o \ - $(GPGPUSIM_ROOT)/cuobjdump_to_ptxplus/cuobjdump_lexer.o \ -o $(SIM_LIB_DIR)/libcudart.dylib $(SIM_LIB_DIR)/libOpenCL.so: $(LIBS) opencllib @@ -109,7 +106,6 @@ $(SIM_LIB_DIR)/libOpenCL.so: $(LIBS) opencllib cudalib: cuda-sim $(MAKE) -C ./libcuda/ depend $(MAKE) -C ./libcuda/ - $(MAKE) -C cuobjdump_to_ptxplus/ cuda-sim: $(MAKE) -C ./src/cuda-sim/ depend @@ -134,6 +130,10 @@ decuda_to_ptxplus/decuda_to_ptxplus: $(MAKE) -C ./decuda_to_ptxplus/ depend $(MAKE) -C ./decuda_to_ptxplus/ +cuobjdump_to_ptxplus/cuobjdump_to_ptxplus: + $(MAKE) -C ./cuobjdump_to_ptxplus/ depend + $(MAKE) -C ./cuobjdump_to_ptxplus/ + makedirs: if [ ! -d $(SIM_LIB_DIR) ]; then mkdir -p $(SIM_LIB_DIR); fi; if [ ! -d $(SIM_OBJ_FILES_DIR)/libcuda ]; then mkdir -p $(SIM_OBJ_FILES_DIR)/libcuda; fi; @@ -165,7 +165,7 @@ 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 ./decuda_to_ptxplus/ $(MAKE) clean -C ./cuobjdump_to_ptxplus/ rm -rf $(SIM_LIB_DIR) rm -rf $(SIM_OBJ_FILES_DIR) |