From 0cb76063ce079a0606598e145da351f134235ab5 Mon Sep 17 00:00:00 2001 From: "Andrew M. B. Boktor" Date: Wed, 18 Apr 2012 16:33:33 -0800 Subject: This changelist implements the following: 1. Adds support for using cuobjdump for both ptx and ptxplus execution. This has been tested with CUDA 4.0 . Ptxplus is no longer supported through decuda/decuda_to_ptxplus 2. Adds support for converting the SASS output by cuobjdump to ptxplus. This has been tested with CUDA 4.0 . The old path that extracts ptx from cubin files is still preserved 3. Adds a bank group model. (WARNING: memory config has changed, please adapt yours). To disable the bank groups model, set nbkgrp to 1 and tCCDL and tRTPL to 0 Diff the configuration files to learn about how to use those new options. Merging //depot/gpgpu_sim_research/fermi-test/distribution/... to //depot/gpgpu_sim_research/fermi/distribution/... [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 12023] --- src/cuda-sim/Makefile | 73 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 26 deletions(-) (limited to 'src/cuda-sim/Makefile') diff --git a/src/cuda-sim/Makefile b/src/cuda-sim/Makefile index a475ca2..a70ee5f 100644 --- a/src/cuda-sim/Makefile +++ b/src/cuda-sim/Makefile @@ -159,13 +159,15 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c ../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/gnu/stubs-64.h ../../build/release/cuda-sim/cuda_device_printf.o: ptx.tab.h ptx_sim.h ../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/stdlib.h +../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/bits/waitflags.h +../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/bits/waitstatus.h +../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/endian.h +../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/bits/endian.h +../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/sys/types.h ../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/bits/types.h ../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/bits/typesizes.h ../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/time.h -../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/endian.h -../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/bits/endian.h -../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/sys/select.h ../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/bits/select.h ../../build/release/cuda-sim/cuda_device_printf.o: /usr/include/bits/sigset.h @@ -193,13 +195,15 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c ../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/wordsize.h ../../build/release/cuda-sim/cuda-sim.o: /usr/include/gnu/stubs.h ../../build/release/cuda-sim/cuda-sim.o: /usr/include/gnu/stubs-64.h +../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/waitflags.h +../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/waitstatus.h +../../build/release/cuda-sim/cuda-sim.o: /usr/include/endian.h +../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/endian.h +../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/cuda-sim.o: /usr/include/sys/types.h ../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/types.h ../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/typesizes.h ../../build/release/cuda-sim/cuda-sim.o: /usr/include/time.h -../../build/release/cuda-sim/cuda-sim.o: /usr/include/endian.h -../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/endian.h -../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/cuda-sim.o: /usr/include/sys/select.h ../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/select.h ../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/sigset.h @@ -242,6 +246,7 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c ../../build/release/cuda-sim/cuda-sim.o: /usr/include/zconf.h ../../build/release/cuda-sim/cuda-sim.o: /usr/include/unistd.h ../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/posix_opt.h +../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/environments.h ../../build/release/cuda-sim/cuda-sim.o: /usr/include/bits/confname.h ../../build/release/cuda-sim/cuda-sim.o: /usr/include/getopt.h ../../build/release/cuda-sim/cuda-sim.o: ../gpgpu-sim/scoreboard.h @@ -261,13 +266,15 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c ../../build/release/cuda-sim/instructions.o: /usr/include/gnu/stubs-64.h ../../build/release/cuda-sim/instructions.o: ptx.tab.h ptx_sim.h ../../build/release/cuda-sim/instructions.o: /usr/include/stdlib.h +../../build/release/cuda-sim/instructions.o: /usr/include/bits/waitflags.h +../../build/release/cuda-sim/instructions.o: /usr/include/bits/waitstatus.h +../../build/release/cuda-sim/instructions.o: /usr/include/endian.h +../../build/release/cuda-sim/instructions.o: /usr/include/bits/endian.h +../../build/release/cuda-sim/instructions.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/instructions.o: /usr/include/sys/types.h ../../build/release/cuda-sim/instructions.o: /usr/include/bits/types.h ../../build/release/cuda-sim/instructions.o: /usr/include/bits/typesizes.h ../../build/release/cuda-sim/instructions.o: /usr/include/time.h -../../build/release/cuda-sim/instructions.o: /usr/include/endian.h -../../build/release/cuda-sim/instructions.o: /usr/include/bits/endian.h -../../build/release/cuda-sim/instructions.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/instructions.o: /usr/include/sys/select.h ../../build/release/cuda-sim/instructions.o: /usr/include/bits/select.h ../../build/release/cuda-sim/instructions.o: /usr/include/bits/sigset.h @@ -311,6 +318,7 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c ../../build/release/cuda-sim/instructions.o: /usr/include/zconf.h ../../build/release/cuda-sim/instructions.o: /usr/include/unistd.h ../../build/release/cuda-sim/instructions.o: /usr/include/bits/posix_opt.h +../../build/release/cuda-sim/instructions.o: /usr/include/bits/environments.h ../../build/release/cuda-sim/instructions.o: /usr/include/bits/confname.h ../../build/release/cuda-sim/instructions.o: /usr/include/getopt.h ../../build/release/cuda-sim/instructions.o: ../gpgpu-sim/scoreboard.h @@ -336,11 +344,13 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c ../../build/release/cuda-sim/memory.o: /usr/include/bits/stdio_lim.h ../../build/release/cuda-sim/memory.o: /usr/include/bits/sys_errlist.h ../../build/release/cuda-sim/memory.o: /usr/include/stdlib.h -../../build/release/cuda-sim/memory.o: /usr/include/sys/types.h -../../build/release/cuda-sim/memory.o: /usr/include/time.h +../../build/release/cuda-sim/memory.o: /usr/include/bits/waitflags.h +../../build/release/cuda-sim/memory.o: /usr/include/bits/waitstatus.h ../../build/release/cuda-sim/memory.o: /usr/include/endian.h ../../build/release/cuda-sim/memory.o: /usr/include/bits/endian.h ../../build/release/cuda-sim/memory.o: /usr/include/bits/byteswap.h +../../build/release/cuda-sim/memory.o: /usr/include/sys/types.h +../../build/release/cuda-sim/memory.o: /usr/include/time.h ../../build/release/cuda-sim/memory.o: /usr/include/sys/select.h ../../build/release/cuda-sim/memory.o: /usr/include/bits/select.h ../../build/release/cuda-sim/memory.o: /usr/include/bits/sigset.h @@ -358,13 +368,15 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c ../../build/release/cuda-sim/ptx_ir.o: /usr/include/gnu/stubs.h ../../build/release/cuda-sim/ptx_ir.o: /usr/include/gnu/stubs-64.h ptx.tab.h ../../build/release/cuda-sim/ptx_ir.o: ptx_sim.h /usr/include/stdlib.h +../../build/release/cuda-sim/ptx_ir.o: /usr/include/bits/waitflags.h +../../build/release/cuda-sim/ptx_ir.o: /usr/include/bits/waitstatus.h +../../build/release/cuda-sim/ptx_ir.o: /usr/include/endian.h +../../build/release/cuda-sim/ptx_ir.o: /usr/include/bits/endian.h +../../build/release/cuda-sim/ptx_ir.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/ptx_ir.o: /usr/include/sys/types.h ../../build/release/cuda-sim/ptx_ir.o: /usr/include/bits/types.h ../../build/release/cuda-sim/ptx_ir.o: /usr/include/bits/typesizes.h ../../build/release/cuda-sim/ptx_ir.o: /usr/include/time.h -../../build/release/cuda-sim/ptx_ir.o: /usr/include/endian.h -../../build/release/cuda-sim/ptx_ir.o: /usr/include/bits/endian.h -../../build/release/cuda-sim/ptx_ir.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/ptx_ir.o: /usr/include/sys/select.h ../../build/release/cuda-sim/ptx_ir.o: /usr/include/bits/select.h ../../build/release/cuda-sim/ptx_ir.o: /usr/include/bits/sigset.h @@ -393,13 +405,15 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c ../../build/release/cuda-sim/ptx_loader.o: /usr/include/gnu/stubs-64.h ../../build/release/cuda-sim/ptx_loader.o: ptx.tab.h ptx_sim.h ../../build/release/cuda-sim/ptx_loader.o: /usr/include/stdlib.h +../../build/release/cuda-sim/ptx_loader.o: /usr/include/bits/waitflags.h +../../build/release/cuda-sim/ptx_loader.o: /usr/include/bits/waitstatus.h +../../build/release/cuda-sim/ptx_loader.o: /usr/include/endian.h +../../build/release/cuda-sim/ptx_loader.o: /usr/include/bits/endian.h +../../build/release/cuda-sim/ptx_loader.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/ptx_loader.o: /usr/include/sys/types.h ../../build/release/cuda-sim/ptx_loader.o: /usr/include/bits/types.h ../../build/release/cuda-sim/ptx_loader.o: /usr/include/bits/typesizes.h ../../build/release/cuda-sim/ptx_loader.o: /usr/include/time.h -../../build/release/cuda-sim/ptx_loader.o: /usr/include/endian.h -../../build/release/cuda-sim/ptx_loader.o: /usr/include/bits/endian.h -../../build/release/cuda-sim/ptx_loader.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/ptx_loader.o: /usr/include/sys/select.h ../../build/release/cuda-sim/ptx_loader.o: /usr/include/bits/select.h ../../build/release/cuda-sim/ptx_loader.o: /usr/include/bits/sigset.h @@ -433,13 +447,15 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c ../../build/release/cuda-sim/ptx_parser.o: /usr/include/gnu/stubs-64.h ../../build/release/cuda-sim/ptx_parser.o: ptx.tab.h ptx_sim.h ../../build/release/cuda-sim/ptx_parser.o: /usr/include/stdlib.h +../../build/release/cuda-sim/ptx_parser.o: /usr/include/bits/waitflags.h +../../build/release/cuda-sim/ptx_parser.o: /usr/include/bits/waitstatus.h +../../build/release/cuda-sim/ptx_parser.o: /usr/include/endian.h +../../build/release/cuda-sim/ptx_parser.o: /usr/include/bits/endian.h +../../build/release/cuda-sim/ptx_parser.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/ptx_parser.o: /usr/include/sys/types.h ../../build/release/cuda-sim/ptx_parser.o: /usr/include/bits/types.h ../../build/release/cuda-sim/ptx_parser.o: /usr/include/bits/typesizes.h ../../build/release/cuda-sim/ptx_parser.o: /usr/include/time.h -../../build/release/cuda-sim/ptx_parser.o: /usr/include/endian.h -../../build/release/cuda-sim/ptx_parser.o: /usr/include/bits/endian.h -../../build/release/cuda-sim/ptx_parser.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/ptx_parser.o: /usr/include/sys/select.h ../../build/release/cuda-sim/ptx_parser.o: /usr/include/bits/select.h ../../build/release/cuda-sim/ptx_parser.o: /usr/include/bits/sigset.h @@ -465,13 +481,15 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c ../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/wordsize.h ../../build/release/cuda-sim/ptx_sim.o: /usr/include/gnu/stubs.h ../../build/release/cuda-sim/ptx_sim.o: /usr/include/gnu/stubs-64.h +../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/waitflags.h +../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/waitstatus.h +../../build/release/cuda-sim/ptx_sim.o: /usr/include/endian.h +../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/endian.h +../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/ptx_sim.o: /usr/include/sys/types.h ../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/types.h ../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/typesizes.h ../../build/release/cuda-sim/ptx_sim.o: /usr/include/time.h -../../build/release/cuda-sim/ptx_sim.o: /usr/include/endian.h -../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/endian.h -../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/ptx_sim.o: /usr/include/sys/select.h ../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/select.h ../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/sigset.h @@ -513,6 +531,7 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c ../../build/release/cuda-sim/ptx_sim.o: /usr/include/zconf.h ../../build/release/cuda-sim/ptx_sim.o: /usr/include/unistd.h ../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/posix_opt.h +../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/environments.h ../../build/release/cuda-sim/ptx_sim.o: /usr/include/bits/confname.h ../../build/release/cuda-sim/ptx_sim.o: /usr/include/getopt.h ../../build/release/cuda-sim/ptx_sim.o: ../gpgpu-sim/scoreboard.h @@ -530,13 +549,15 @@ $(OUTPUT_DIR)/lex.ptx_.o: ptx.tab.c ../../build/release/cuda-sim/ptx-stats.o: /usr/include/gnu/stubs-64.h ../../build/release/cuda-sim/ptx-stats.o: ptx.tab.h ptx_sim.h ../../build/release/cuda-sim/ptx-stats.o: /usr/include/stdlib.h +../../build/release/cuda-sim/ptx-stats.o: /usr/include/bits/waitflags.h +../../build/release/cuda-sim/ptx-stats.o: /usr/include/bits/waitstatus.h +../../build/release/cuda-sim/ptx-stats.o: /usr/include/endian.h +../../build/release/cuda-sim/ptx-stats.o: /usr/include/bits/endian.h +../../build/release/cuda-sim/ptx-stats.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/ptx-stats.o: /usr/include/sys/types.h ../../build/release/cuda-sim/ptx-stats.o: /usr/include/bits/types.h ../../build/release/cuda-sim/ptx-stats.o: /usr/include/bits/typesizes.h ../../build/release/cuda-sim/ptx-stats.o: /usr/include/time.h -../../build/release/cuda-sim/ptx-stats.o: /usr/include/endian.h -../../build/release/cuda-sim/ptx-stats.o: /usr/include/bits/endian.h -../../build/release/cuda-sim/ptx-stats.o: /usr/include/bits/byteswap.h ../../build/release/cuda-sim/ptx-stats.o: /usr/include/sys/select.h ../../build/release/cuda-sim/ptx-stats.o: /usr/include/bits/select.h ../../build/release/cuda-sim/ptx-stats.o: /usr/include/bits/sigset.h -- cgit v1.3