summaryrefslogtreecommitdiff
path: root/src/gpgpu-sim/shader.cc
diff options
context:
space:
mode:
authorTor Aamodt <[email protected]>2010-11-28 22:47:22 -0800
committerTor Aamodt <[email protected]>2010-11-28 22:47:22 -0800
commit1effdbcc0f33f2b73288802d18d3f842978d7004 (patch)
tree92d5304a7ca517af523a69c50da8c4bdb0e78185 /src/gpgpu-sim/shader.cc
parent6e06c2e1de8c51a88845b7f35cea219dca7456f2 (diff)
bug fix for ptxplus w/ data cache disabled
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 8156]
Diffstat (limited to 'src/gpgpu-sim/shader.cc')
-rw-r--r--src/gpgpu-sim/shader.cc3
1 files changed, 1 insertions, 2 deletions
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() )