Merge pull request #186 from lucylufei/francois-update

Add activemask, bfind, vmin, vmax implementations

1 files changed, 3 insertions, 2 deletions

diff --git a/src/cuda-sim/ptx_parser.cc b/src/cuda-sim/ptx_parser.cc
index 3ae8de3..549c08c 100644
--- a/src/cuda-sim/ptx_parser.cc
+++ b/src/cuda-sim/ptx_parser.cc
@@ -624,8 +624,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;