From b577cbcdf229a2c02d1bf8584c6e82be7a14cb33 Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Sat, 16 Oct 2010 17:30:52 -0800 Subject: 1. creating cache_config object to encapsulate cache configuration information (and parse it before creating the simulator objects). 2. creating core_config to hold only features of a shader_core that are high level enough either (a) the functional simulator needs to know about them, or (b) they affect memory *access* generation. 3. in config files only (so far) separate out notion of write-{through,back}, from notion of when a line is allocated... will use this to distinguish different types of caches. passing CUDA 3.1 regression [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7870] --- src/cuda-sim/ptx_ir.cc | 2 +- src/cuda-sim/ptx_ir.h | 2 +- src/cuda-sim/ptx_parser.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/cuda-sim') diff --git a/src/cuda-sim/ptx_ir.cc b/src/cuda-sim/ptx_ir.cc index 8d7fa11..5def6db 100644 --- a/src/cuda-sim/ptx_ir.cc +++ b/src/cuda-sim/ptx_ir.cc @@ -983,7 +983,7 @@ ptx_instruction::ptx_instruction( int opcode, const char *file, unsigned line, const char *source, - const shader_core_config *config ) : warp_inst_t(config) + const core_config *config ) : warp_inst_t(config) { m_uid = ++g_num_ptx_inst_uid; m_PC = 0; diff --git a/src/cuda-sim/ptx_ir.h b/src/cuda-sim/ptx_ir.h index 84ded76..cea2e2b 100644 --- a/src/cuda-sim/ptx_ir.h +++ b/src/cuda-sim/ptx_ir.h @@ -801,7 +801,7 @@ public: const char *file, unsigned line, const char *source, - const shader_core_config *config ); + const core_config *config ); void print_insn() const; virtual void print_insn( FILE *fp ) const; diff --git a/src/cuda-sim/ptx_parser.cc b/src/cuda-sim/ptx_parser.cc index c4486a2..1081c3c 100644 --- a/src/cuda-sim/ptx_parser.cc +++ b/src/cuda-sim/ptx_parser.cc @@ -68,8 +68,8 @@ extern "C" int ptx_error( const char *s ); extern int ptx_lineno; -static const struct shader_core_config *g_shader_core_config; -void set_ptx_warp_size(const struct shader_core_config * warp_size) +static const struct core_config *g_shader_core_config; +void set_ptx_warp_size(const struct core_config * warp_size) { g_shader_core_config=warp_size; } -- cgit v1.3