summaryrefslogtreecommitdiff
path: root/src/gpgpu-sim/gpu-cache.h
diff options
context:
space:
mode:
authorMahmoud Khairy A. Abdallah <[email protected]>2021-05-19 18:28:41 -0400
committerMahmoud Khairy A. Abdallah <[email protected]>2021-05-19 18:28:41 -0400
commit604baaf59255776b4714c0270ce36ad823d34df4 (patch)
treef421f325cdc4ff43e007d06111f12237e43459d1 /src/gpgpu-sim/gpu-cache.h
parent33635368080d125391766d32223b4eaaa50396e6 (diff)
fixing the failing of merging
Diffstat (limited to 'src/gpgpu-sim/gpu-cache.h')
-rw-r--r--src/gpgpu-sim/gpu-cache.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gpgpu-sim/gpu-cache.h b/src/gpgpu-sim/gpu-cache.h
index 75dce40..d801528 100644
--- a/src/gpgpu-sim/gpu-cache.h
+++ b/src/gpgpu-sim/gpu-cache.h
@@ -841,8 +841,8 @@ class cache_config {
char *m_config_stringPrefL1;
char *m_config_stringPrefShared;
FuncCache cache_status;
- unsigned m_wr_percent;
unsigned m_unified_cache_size;
+ unsigned m_wr_percent;
write_allocate_policy_t get_write_allocate_policy() {
return m_write_alloc_policy;
}
@@ -897,7 +897,6 @@ class cache_config {
unsigned m_data_port_width; //< number of byte the cache can access per cycle
enum set_index_function
m_set_index_function; // Hash, linear, or custom set index function
- unsigned m_wr_percent;
friend class tag_array;
friend class baseline_cache;