summaryrefslogtreecommitdiff
path: root/src/cuda-sim/ptx_ir.h
diff options
context:
space:
mode:
authorJ <[email protected]>2018-08-17 16:02:39 -0700
committerJ <[email protected]>2018-08-17 16:02:39 -0700
commit0e8d4f190940681601bdf7f95a5686baa0b6463b (patch)
tree2b2e5ede3ea573356beaf55b41976488372991e8 /src/cuda-sim/ptx_ir.h
parentc8a823a4cd59f43a454411f6d3b949603a4d5ac4 (diff)
parentcbe8e3ddbca3895a499882c31b080a58a7545d25 (diff)
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'src/cuda-sim/ptx_ir.h')
-rw-r--r--src/cuda-sim/ptx_ir.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cuda-sim/ptx_ir.h b/src/cuda-sim/ptx_ir.h
index e726ab9..768b3e7 100644
--- a/src/cuda-sim/ptx_ir.h
+++ b/src/cuda-sim/ptx_ir.h
@@ -1297,6 +1297,7 @@ public:
unsigned offset = 0;
if (m_param_configs.size()>0){
unsigned offset_nom = m_param_configs.back().first + m_param_configs.back().second;
+ //ensure offset matches alignment requirements
offset = offset_nom%alignment ? (offset_nom/alignment + 1) * alignment : offset_nom;
}
m_param_configs.push_back(std::pair<size_t,unsigned>(size, offset));