summaryrefslogtreecommitdiff
path: root/src/gpgpu-sim
diff options
context:
space:
mode:
authortgrogers <[email protected]>2018-09-11 21:46:34 -0400
committertgrogers <[email protected]>2018-09-11 21:46:34 -0400
commit879023148950e7322b5aa85dd98a60b3a069cd44 (patch)
tree1523d02ee947078f89506e44516ebc7fc94c9bb9 /src/gpgpu-sim
parent46817ba62f475ba1202c31a8939ea1a1de81a410 (diff)
parentf4116831d7354c80dcd3cf857fcb5be7b001d70f (diff)
Merge branch 'dev-purdue-integration' of https://github.rcac.purdue.edu/TimRogersGroup/gpgpu-sim_distribution into dev-purdue-integration
Diffstat (limited to 'src/gpgpu-sim')
-rw-r--r--src/gpgpu-sim/shader.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc
index d2f40a1..533c6f9 100644
--- a/src/gpgpu-sim/shader.cc
+++ b/src/gpgpu-sim/shader.cc
@@ -1537,7 +1537,7 @@ bool ldst_unit::memory_cycle( warp_inst_t &inst, mem_stage_stall_type &stall_rea
bypassL1D = true;
} else if (inst.space.is_global()) { // global memory access
// skip L1 cache if the option is enabled
- if (m_core->get_config()->gmem_skip_L1D)
+ if (m_core->get_config()->gmem_skip_L1D && (CACHE_L1 != inst.cache_op))
bypassL1D = true;
}