From c5677a028d56b84dfe5939f78a71e0e60373a0ed Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Sat, 17 Jul 2010 16:53:43 -0800 Subject: param space updates for correct parsing (still need to allocate thread local storage for local param memory) [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 6871] --- src/gpgpu-sim/shader.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/gpgpu-sim') diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc index c0e500d..b9ae7da 100644 --- a/src/gpgpu-sim/shader.cc +++ b/src/gpgpu-sim/shader.cc @@ -1659,7 +1659,7 @@ inline int is_const ( memory_space_t space ) { } inline int is_local ( memory_space_t space ) { - assert( space != param_space_local_r && space != param_space_local_w ); // todo: map local param memory to linear address space + assert( space != param_space_local ); // todo: map local param memory to linear address space return((space) == local_space); } @@ -2484,8 +2484,7 @@ mem_stage_stall_type send_mem_request(shader_core_ctx_t *shader, mem_access_t &a code = DCACHE; access_type = (access.iswrite)? LOCAL_ACC_W: LOCAL_ACC_R; break; - case param_space_local_r: - case param_space_local_w: + case param_space_local: abort(); // todo: define mapping of local param space to linear memory ? break; default: @@ -2778,8 +2777,7 @@ inline void mem_instruction_stats(inst_t* warp){ gpgpu_n_const_insn++; break; case param_space_kernel: - case param_space_local_r: - case param_space_local_w: + case param_space_local: gpgpu_n_param_insn++; break; case tex_space: @@ -2842,10 +2840,12 @@ void shader_memory_queue(shader_core_ctx_t *shader, shader_queues_t *accessqs) path[i] = GLOBAL_MEM_PATH; type_counts[GLOBAL_MEM_PATH]++; break; - case param_space_local_r: - case param_space_local_w: + case param_space_local: + case param_space_unclassified: + abort(); // todo: define access details + break; default: - abort(); + break; } } -- cgit v1.3