added detection for invalid command queue index (this corresponds to the number of queues that can be submitted to an engine)

Author: myrepo1

backends/ze/ze_validator_entry_exit_helpers.rb

@@ -1,6 +1,19 @@
 require 'ze_validator_zemodel'
 require 'ze_library'
 
+def check_valid_index_for_ordinal(state,ctx,queue_handle,ordinal,index)
+  #puts "entered"
+  if state.device_properties
+    command_queue_prop = state.device_properties["devices"][0]["command_queue_groups"]
+    command_queue_prop.each do |prop|
+      if prop["ordinal"] == ordinal && (index >= prop["numQueues"] || index < 0)#oob index results in segfault
+        state.print_usage_error(ctx, "command queue (#{state.get_handle_str(queue_handle)}) with ordinal = #{ordinal} was created " + 
+                                     "with index = #{index}. Index value should be: 0<= index < #{prop["numQueues"]}")
+      end 
+    end 
+  end
+end
+
 def check_group_property_queued(state, ctx, defi, device)
   #puts "device = #{device}"
   if !(device.cmd_queue_group_properties_queried) && state.print_tracker["check_group_property"] == 0

backends/ze/ze_validator_function_entry_exit_callbacks.rb

@@ -100,7 +100,9 @@
   #check if the group property was hardcoded
   command_queues = state.find_objects(ctx, 'command_queue')
   command_queue = command_queues[defi['hCommandQueue']]
-  check_group_property_queued(state,ctx,defi,command_queue.device)
+  if command_queue
+    check_group_property_queued(state,ctx,defi,command_queue.device)
+  end
 }
 
 #When a fence signals the host, set the fence's status to signaled 
@@ -242,15 +244,23 @@
 }
 
 $on_successful_exit['zeCommandQueueCreate'] = lambda { |state, ctx, defi|
+  #puts "create"
   command_queues = state.find_objects(ctx, 'command_queue')
   context = state.find_object(ctx, 'context', 'hContext')
   device = state.find_object(ctx, 'device', 'hDevice')
   desc_val = state.find_param(ctx, 'desc_val')
   desc = state.to_struct(desc_val, ZE::ZECommandQueueDesc)
   handle = defi['phCommandQueue_val']
-  #puts "ordinal = #{desc[:ordinal]}"
   command_queues[handle] = ZEModel::CommandQueue.new(handle, context, device, desc)
   context.command_queues[handle] = command_queues[handle]
+  #check_valid_index_for_ordinal(state,ctx,handle,desc[:ordinal],desc[:index])
+}
+
+$on_erroneous_exit['zeCommandQueueCreate'] = lambda { |state, ctx, defi|
+  desc_val = state.find_param(ctx, 'desc_val')
+  desc = state.to_struct(desc_val, ZE::ZECommandQueueDesc)
+  handle = state.find_param(ctx, 'phCommandQueue')
+  check_valid_index_for_ordinal(state,ctx,handle,desc[:ordinal],desc[:index])
 }
 
 $on_successful_exit['zeCommandQueueDestroy'] = lambda { |state, ctx, defi|

backends/ze/ze_validator_state_object.rb

@@ -283,7 +283,7 @@ def on_exit(m,hostname,context,defi)
 
     #check if the return code indicates successful return from the API call
     if validate_result(defi)
-      l = $on_successful_exit[m[1]]
+      l = $on_successful_exit[m[1]] #This might be a problem for tracking erroneous exits.
       l.call(self, context, defi) if l
     else
       l = $on_erroneous_exit[m[1]]
@@ -313,6 +313,7 @@ def consume = lambda { |iterator, _|
             if m[2] == 'entry'
               on_entry(m, hostname, context, defi)
             elsif m[2] == 'exit'
+              puts "#{m[1]}"
               on_exit(m, hostname, context, defi)
             end
           end