diff options
| author | Tor Aamodt <[email protected]> | 2010-11-28 22:47:22 -0800 |
|---|---|---|
| committer | Tor Aamodt <[email protected]> | 2010-11-28 22:47:22 -0800 |
| commit | 1effdbcc0f33f2b73288802d18d3f842978d7004 (patch) | |
| tree | 92d5304a7ca517af523a69c50da8c4bdb0e78185 | |
| parent | 6e06c2e1de8c51a88845b7f35cea219dca7456f2 (diff) | |
bug fix for ptxplus w/ data cache disabled
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 8156]
| -rw-r--r-- | configs/QuadroFX5800/gpgpusim.config | 1 | ||||
| -rw-r--r-- | src/gpgpu-sim/shader.cc | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configs/QuadroFX5800/gpgpusim.config b/configs/QuadroFX5800/gpgpusim.config index 3a62789..a6971b5 100644 --- a/configs/QuadroFX5800/gpgpusim.config +++ b/configs/QuadroFX5800/gpgpusim.config @@ -20,6 +20,7 @@ -gpgpu_tex_cache:l1 8:128:5:L:R:m,F:128:4,128:2 -gpgpu_const_cache:l1 64:64:2:L:R:f,A:2:32,4 -gpgpu_cache:dl2 64:32:8:L:R:m,A:16:4,4 +-gpgpu_cache:dl2_texture_only -gpgpu_shmem_warp_parts 2 diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc index e9ec368..233c2c0 100644 --- a/src/gpgpu-sim/shader.cc +++ b/src/gpgpu-sim/shader.cc @@ -871,8 +871,6 @@ bool ldst_unit::memory_cycle( warp_inst_t &inst, mem_stage_stall_type &stall_rea const mem_access_t &access = inst.accessq_back(); unsigned size = access.get_size(); - assert( CACHE_UNDEFINED != inst.cache_op ); - if( CACHE_GLOBAL == inst.cache_op || (m_L1D == NULL) ) { // bypass L1 cache if( m_icnt->full(size, inst.is_store()) ) { @@ -890,6 +888,7 @@ bool ldst_unit::memory_cycle( warp_inst_t &inst, mem_stage_stall_type &stall_rea m_core->inc_store_req( inst.warp_id() ); } } else { + assert( CACHE_UNDEFINED != inst.cache_op ); stall_cond = process_memory_access_queue(m_L1D,inst); } if( !inst.accessq_empty() ) |