summaryrefslogtreecommitdiff
path: root/src/cuda-sim/ptx_parser.cc
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_parser.cc
parentc8a823a4cd59f43a454411f6d3b949603a4d5ac4 (diff)
parentcbe8e3ddbca3895a499882c31b080a58a7545d25 (diff)
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'src/cuda-sim/ptx_parser.cc')
-rw-r--r--src/cuda-sim/ptx_parser.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cuda-sim/ptx_parser.cc b/src/cuda-sim/ptx_parser.cc
index e6d6325..0ba9a5b 100644
--- a/src/cuda-sim/ptx_parser.cc
+++ b/src/cuda-sim/ptx_parser.cc
@@ -571,7 +571,9 @@ void add_function_arg()
if( g_func_info ) {
PTX_PARSE_DPRINTF("add_function_arg \"%s\"", g_last_symbol->name().c_str() );
g_func_info->add_arg(g_last_symbol);
- g_func_info->add_config_param( g_size, g_alignment_spec );
+ unsigned alignment = (g_alignment_spec==-1) ? g_size : g_alignment_spec;
+ assert(alignment==1||alignment==2||alignment==4||alignment==8||alignment==16);//known valid alignment values
+ g_func_info->add_config_param( g_size, alignment);
}
}