diff options
| author | Tim Rogers <[email protected]> | 2020-07-12 23:07:43 -0400 |
|---|---|---|
| committer | Tim Rogers <[email protected]> | 2020-07-12 23:07:43 -0400 |
| commit | 4192a5df8c400d9fc19d15a9eaca74191e45d08e (patch) | |
| tree | ad6787a77c25f47a47faa7f195da9a011ff18bdc /src/cuda-sim/ptx_parser.cc | |
| parent | 4d64f31587569d4e8800aa81ececb9e809817d78 (diff) | |
| parent | 78a52b027e7ca30860fdf8366c08c0590f857810 (diff) | |
Merge remote-tracking branch 'gpgpu/dev' into dev-4.x
Diffstat (limited to 'src/cuda-sim/ptx_parser.cc')
| -rw-r--r-- | src/cuda-sim/ptx_parser.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cuda-sim/ptx_parser.cc b/src/cuda-sim/ptx_parser.cc index 2265587..afdb41b 100644 --- a/src/cuda-sim/ptx_parser.cc +++ b/src/cuda-sim/ptx_parser.cc @@ -625,8 +625,9 @@ void ptx_recognizer::add_scalar_type_spec(int type_spec) { parse_assert((g_opcode == -1) || (g_opcode == CVT_OP) || (g_opcode == SET_OP) || (g_opcode == SLCT_OP) || (g_opcode == TEX_OP) || (g_opcode == MMA_OP) || - (g_opcode == DP4A_OP), - "only cvt, set, slct, tex and dp4a can have more than one " + (g_opcode == DP4A_OP) || (g_opcode == VMIN_OP) || + (g_opcode == VMAX_OP), + "only cvt, set, slct, tex, vmin, vmax and dp4a can have more than one " "type specifier."); } g_scalar_type_spec = type_spec; |