1. added support for valid index for command queue was implemented.2. support for checking whether the fence,cmd list, cmd queue triplet all share the same context before executing the command list was implemented

Author: myrepo1

backends/ze/ze_validator_entry_exit_helpers.rb

@@ -57,7 +57,7 @@ def check_valid_ordinal(state, ctx, defi, cqg_ordinal)
       end 
     end 
   else
-    #hardcoded if the device property json wasn't generated
+    #hardcode if the device property json wasn't generated
     copy_only_ords << 1
     copy_only_ords << 2
   end 
@@ -177,6 +177,18 @@ def check_valid_module(state,ctx,defi)
     state.print_usage_error(ctx, "Improper hModule was handed")
   end
 end
+def check_list_and_fence_have_matching_context(state,ctx,defi,cmd_list,fence)
+  unless fence && cmd_list && fence.command_queue &&
+         cmd_list.context == fence.command_queue.context
+    state.print_usage_error(ctx, "Mismatching context between command list #{state.get_handle_str(cmd_list.handle)} and fence #{state.get_handle_str(fence.handle)}")
+  end
+end
+
+def check_list_and_queue_have_matching_context(state,ctx,defi,cmd_list, cmd_queue)
+  unless cmd_queue && cmd_list && cmd_list.context == cmd_queue.context 
+    state.print_usage_error(ctx, "Mismatching context between command queue #{state.get_handle_str(cmd_queue.handle)} and command list #{state.get_handle_str(cmd_list.handle)}")
+  end
+end
 
 def check_oob_memory_copy(state,ctx,defi)
   src_ptr = defi['srcptr']

backends/ze/ze_validator_function_entry_exit_callbacks.rb

@@ -70,8 +70,14 @@
   #Retrieve the compute ordinal from the command list
   command_lists = state.find_objects(ctx, 'command_list')
   cmd_list = command_lists[defi['hCommandList']]
-  cqg_ordinal = cmd_list.desc[:commandQueueGroupOrdinal]
-  #puts "cqg_ordinal = #{cqg_ordinal}"
+  cqg_ordinal = 0
+  if cmd_list.desc 
+    cqg_ordinal = cmd_list.desc[:commandQueueGroupOrdinal]
+  elsif cmd_list.altdesc
+    cqg_ordinal =  cmd_list.altdesc[:ordinal]
+  else
+    state.raise_internal_error(ctx, "No valid ordinal could be retrieved within the validator.") 
+  end 
   check_valid_ordinal(state,ctx,defi,cqg_ordinal)
   check_kernel_created(state,ctx,defi)
 }
@@ -99,10 +105,21 @@
   check_fence_misuse(state,ctx,defi)
   #check if the group property was hardcoded
   command_queues = state.find_objects(ctx, 'command_queue')
+  command_lists = state.find_objects(ctx, 'command_list')
   command_queue = command_queues[defi['hCommandQueue']]
+  command_list_handles = defi['phCommandLists_vals']
+  #puts "defi = #{defi}"
+  fences = state.find_objects(ctx, 'fence')
+  fence = fences[defi['hFence']]
   if command_queue
     check_group_property_queued(state,ctx,defi,command_queue.device)
-  end
+    command_list_handles.each do |command_list|
+      check_list_and_queue_have_matching_context(state,ctx,defi,command_lists[command_list],command_queue)
+      check_list_and_fence_have_matching_context(state,ctx,defi,command_lists[command_list],fence)
+    end
+  else
+    state.raise_internal_error(ctx, "No command queue was found")
+  end 
 }
 
 #When a fence signals the host, set the fence's status to signaled 
@@ -244,7 +261,6 @@
 }
 
 $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')
@@ -321,7 +337,6 @@
   check_group_property_queued(state,ctx,defi,device)
   command_lists[handle] = ZEModel::CommandList.new(handle, context, device, nil, altdesc)
   command_lists[handle].immediate = true #immdediate command lists cannot be passed to the execute command lists
-  #puts "altdesc = #{altdesc}"
   command_lists[handle].associated_ordinal = altdesc[:ordinal]
   context.command_lists[handle] = command_lists[handle]
 }
@@ -417,7 +432,6 @@
   handle = defi['phKernel_val']
   kernelName = state.find_param(ctx, 'desc__pKernelName_val')
   kernel = ZEModel::Kernel.new(handle, mod, desc, kernelName)
-  #puts "kernelName = #{state.find_param(ctx, 'desc__pKernelName_val')}"
   kernels[handle] = kernel
   mod.kernels[handle] = kernel
 }

backends/ze/ze_validator_state_object.rb

@@ -286,6 +286,7 @@ def on_exit(m,hostname,context,defi)
       l = $on_successful_exit[m[1]] #This might be a problem for tracking erroneous exits.
       l.call(self, context, defi) if l
     else
+      #puts "failed: #{m[1]}"
       l = $on_erroneous_exit[m[1]]
       l.call(self, context, defi) if l
     end
@@ -313,7 +314,7 @@ def consume = lambda { |iterator, _|
             if m[2] == 'entry'
               on_entry(m, hostname, context, defi)
             elsif m[2] == 'exit'
-              puts "#{m[1]}"
+              #puts "#{m[1]}"
               on_exit(m, hostname, context, defi)
             end
           end

backends/ze/ze_validator_zemodel.rb

@@ -198,14 +198,13 @@ class Fence < Object
     @typename = 'fence'
     attr_reader :command_queue
     attr_reader :desc
-    attr_accessor :command_queue_history
+    
 
     def initialize(handle, command_queue, desc)
       super(handle)
       @command_queue = command_queue
       @desc = desc
-      @status = @@INITIALIZED 
-      @command_queue_history = []
+      @status = @@INITIALIZED
     end
 
     #is it suitable to put this here?