testsuites/validation/tr-tq-timeout-priority-inherit.c

2 files changed, 486 insertions, 284 deletions

diff --git a/testsuites/validation/tr-tq-timeout-priority-inherit.c b/testsuites/validation/tr-tq-timeout-priority-inherit.c
index 85a77ee564..6334cea5ca 100644
--- a/testsuites/validation/tr-tq-timeout-priority-inherit.c
+++ b/testsuites/validation/tr-tq-timeout-priority-inherit.c
@@ -70,18 +70,19 @@
  */
 
 typedef struct {
-  uint16_t Skip : 1;
-  uint16_t Pre_Scheduler_NA : 1;
-  uint16_t Pre_Queue_NA : 1;
-  uint16_t Pre_OwnerPriority_NA : 1;
-  uint16_t Pre_OwnerState_NA : 1;
-  uint16_t Pre_OwnerQueue_NA : 1;
-  uint16_t Pre_OwnerOwnerPriority_NA : 1;
-  uint16_t Pre_WaitState_NA : 1;
-  uint16_t Post_Status : 2;
-  uint16_t Post_Unblock : 2;
-  uint16_t Post_OwnerPriority : 2;
-  uint16_t Post_OwnerOwnerPriority : 2;
+  uint32_t Skip : 1;
+  uint32_t Pre_Scheduler_NA : 1;
+  uint32_t Pre_OtherScheduler_NA : 1;
+  uint32_t Pre_Queue_NA : 1;
+  uint32_t Pre_OwnerPriority_NA : 1;
+  uint32_t Pre_OwnerState_NA : 1;
+  uint32_t Pre_OwnerQueue_NA : 1;
+  uint32_t Pre_OwnerOwnerPriority_NA : 1;
+  uint32_t Pre_WaitState_NA : 1;
+  uint32_t Post_Status : 2;
+  uint32_t Post_Unblock : 2;
+  uint32_t Post_OwnerPriority : 2;
+  uint32_t Post_OwnerOwnerPriority : 2;
 } ScoreTqReqTimeoutPriorityInherit_Entry;
 
 /**
@@ -100,6 +101,12 @@ typedef struct {
   rtems_id scheduler_id;
 
   /**
+   * @brief If this member is true, then the thread shall have at least two
+   *   eligible scheduler.
+   */
+  bool other_scheduler;
+
+  /**
    * @brief This member specifies the queue node kind.
    */
   TQNodeKind queue_node;
@@ -206,12 +213,12 @@ typedef struct {
      * @brief This member defines the pre-condition indices for the next
      *   action.
      */
-    size_t pci[ 7 ];
+    size_t pci[ 8 ];
 
     /**
      * @brief This member defines the pre-condition states for the next action.
      */
-    size_t pcs[ 7 ];
+    size_t pcs[ 8 ];
 
     /**
      * @brief If this member is true, then the test action loop is executed.
@@ -245,6 +252,12 @@ static const char * const ScoreTqReqTimeoutPriorityInherit_PreDesc_Scheduler[] =
   "NA"
 };
 
+static const char * const ScoreTqReqTimeoutPriorityInherit_PreDesc_OtherScheduler[] = {
+  "Yes",
+  "No",
+  "NA"
+};
+
 static const char * const ScoreTqReqTimeoutPriorityInherit_PreDesc_Queue[] = {
   "Only",
   "Vital",
@@ -290,6 +303,7 @@ static const char * const ScoreTqReqTimeoutPriorityInherit_PreDesc_WaitState[] =
 
 static const char * const * const ScoreTqReqTimeoutPriorityInherit_PreDesc[] = {
   ScoreTqReqTimeoutPriorityInherit_PreDesc_Scheduler,
+  ScoreTqReqTimeoutPriorityInherit_PreDesc_OtherScheduler,
   ScoreTqReqTimeoutPriorityInherit_PreDesc_Queue,
   ScoreTqReqTimeoutPriorityInherit_PreDesc_OwnerPriority,
   ScoreTqReqTimeoutPriorityInherit_PreDesc_OwnerState,
@@ -303,6 +317,8 @@ typedef ScoreTqReqTimeoutPriorityInherit_Context Context;
 
 #define THREAD TQ_BLOCKER_A
 
+#define THREAD_HELPER TQ_HELPER_B
+
 #define QUEUE_HELPER TQ_BLOCKER_B
 
 #define OWNER TQ_BLOCKER_C
@@ -340,15 +356,6 @@ static void Tick( void *arg )
   TQSchedulerRecordStart( ctx->tq_ctx );
   FinalClockTick();
   TQSchedulerRecordStop( ctx->tq_ctx );
-
-  ctx->owner_priority_after = GetPriorityByScheduler(
-    ctx->tq_ctx->worker_id[ OWNER ],
-    ctx->scheduler_id
-  );
-  ctx->owner_owner_priority_after = GetPriorityByScheduler(
-    ctx->tq_ctx->worker_id[ OWNER_OWNER ],
-    ctx->scheduler_id
-  );
 }
 
 static void SchedulerBlock(
@@ -414,6 +421,49 @@ static void SchedulerUnblock(
   }
 }
 
+static void GetPriorities( Context *ctx )
+{
+  ctx->owner_priority_after = GetPriorityByScheduler(
+    ctx->tq_ctx->worker_id[ OWNER ],
+    ctx->scheduler_id
+  );
+  ctx->owner_owner_priority_after = GetPriorityByScheduler(
+    ctx->tq_ctx->worker_id[ OWNER_OWNER ],
+    ctx->scheduler_id
+  );
+}
+
+static void PrepareThread( const Context *ctx )
+{
+  if ( ctx->other_scheduler ) {
+    rtems_id other_scheduler_id;
+
+    if ( ctx->scheduler_id == SCHEDULER_A_ID ) {
+      other_scheduler_id = SCHEDULER_B_ID;
+    } else {
+      other_scheduler_id = SCHEDULER_B_ID;
+    }
+
+    TQSetScheduler(
+      ctx->tq_ctx,
+      THREAD_HELPER,
+      other_scheduler_id,
+      PRIO_NEARLY_IDLE - 1
+    );
+
+    TQSendAndWaitForExecutionStop(
+      ctx->tq_ctx,
+      THREAD,
+      TQ_EVENT_MUTEX_D_OBTAIN
+    );
+    TQSendAndWaitForExecutionStop(
+      ctx->tq_ctx,
+      THREAD_HELPER,
+      TQ_EVENT_MUTEX_D_OBTAIN
+    );
+  }
+}
+
 static rtems_task_priority PrepareQueue(
   Context            *ctx,
   rtems_task_priority priority
@@ -431,7 +481,11 @@ static rtems_task_priority PrepareQueue(
         ctx->scheduler_id,
         priority + 1
       );
-      TQSend( ctx->tq_ctx, QUEUE_HELPER, TQ_EVENT_ENQUEUE );
+      TQSendAndWaitForExecutionStop(
+        ctx->tq_ctx,
+        QUEUE_HELPER,
+        TQ_EVENT_ENQUEUE
+      );
       break;
     case TQ_NODE_DISPENSABLE:
       ctx->queue_helper_surrender = true;
@@ -442,7 +496,11 @@ static rtems_task_priority PrepareQueue(
         ctx->scheduler_id,
         priority
       );
-      TQSend( ctx->tq_ctx, QUEUE_HELPER, TQ_EVENT_ENQUEUE );
+      TQSendAndWaitForExecutionStop(
+        ctx->tq_ctx,
+        QUEUE_HELPER,
+        TQ_EVENT_ENQUEUE
+      );
       break;
   }
 
@@ -648,6 +706,33 @@ static void ScoreTqReqTimeoutPriorityInherit_Pre_Scheduler_Prepare(
   }
 }
 
+static void ScoreTqReqTimeoutPriorityInherit_Pre_OtherScheduler_Prepare(
+  ScoreTqReqTimeoutPriorityInherit_Context           *ctx,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OtherScheduler state
+)
+{
+  switch ( state ) {
+    case ScoreTqReqTimeoutPriorityInherit_Pre_OtherScheduler_Yes: {
+      /*
+       * While the thread has at least two eligible scheduler.
+       */
+      ctx->other_scheduler = true;
+      break;
+    }
+
+    case ScoreTqReqTimeoutPriorityInherit_Pre_OtherScheduler_No: {
+      /*
+       * While the thread has exactly one eligible scheduler.
+       */
+      ctx->other_scheduler = false;
+      break;
+    }
+
+    case ScoreTqReqTimeoutPriorityInherit_Pre_OtherScheduler_NA:
+      break;
+  }
+}
+
 static void ScoreTqReqTimeoutPriorityInherit_Pre_Queue_Prepare(
   ScoreTqReqTimeoutPriorityInherit_Context  *ctx,
   ScoreTqReqTimeoutPriorityInherit_Pre_Queue state
@@ -1120,6 +1205,7 @@ static void ScoreTqReqTimeoutPriorityInherit_Action(
     TQSend( ctx->tq_ctx, OWNER, ctx->owner_obtain | ctx->owner_release );
   }
 
+  PrepareThread( ctx );
   priority = PrepareQueue( ctx, priority );
   priority = PrepareOwner( ctx, priority );
   priority = PrepareOwnerQueue( ctx, priority );
@@ -1135,6 +1221,7 @@ static void ScoreTqReqTimeoutPriorityInherit_Action(
         TQ_EVENT_ENQUEUE_TIMED
       );
       Tick( ctx );
+      GetPriorities( ctx );
       TQSend( ctx->tq_ctx, OWNER, TQ_EVENT_SURRENDER );
       break;
     case TQ_WAIT_STATE_INTEND_TO_BLOCK:
@@ -1144,6 +1231,7 @@ static void ScoreTqReqTimeoutPriorityInherit_Action(
         THREAD,
         TQ_EVENT_ENQUEUE_TIMED
       );
+      GetPriorities( ctx );
       TQSend( ctx->tq_ctx, OWNER, TQ_EVENT_SURRENDER );
       break;
     case TQ_WAIT_STATE_READY_AGAIN:
@@ -1154,16 +1242,7 @@ static void ScoreTqReqTimeoutPriorityInherit_Action(
       );
       T_scheduler_set_event_handler( SchedulerUnblock, ctx );
       TQSend( ctx->tq_ctx, OWNER, TQ_EVENT_SURRENDER );
-
-      ctx->owner_priority_after = GetPriorityByScheduler(
-        ctx->tq_ctx->worker_id[ OWNER ],
-        ctx->scheduler_id
-      );
-      ctx->owner_owner_priority_after = GetPriorityByScheduler(
-        ctx->tq_ctx->worker_id[ OWNER_OWNER ],
-        ctx->scheduler_id
-      );
-
+      GetPriorities( ctx );
       TQSend( ctx->tq_ctx, THREAD, TQ_EVENT_SURRENDER );
       break;
   }
@@ -1217,438 +1296,462 @@ static void ScoreTqReqTimeoutPriorityInherit_Cleanup(
       TQ_EVENT_MUTEX_A_RELEASE
     );
   }
+
+  if ( ctx->other_scheduler ) {
+    TQSendAndWaitForExecutionStop(
+      ctx->tq_ctx,
+      THREAD,
+      TQ_EVENT_MUTEX_D_RELEASE
+    );
+    TQSendAndWaitForExecutionStop(
+      ctx->tq_ctx,
+      THREAD_HELPER,
+      TQ_EVENT_MUTEX_D_RELEASE
+    );
+  }
 }
 
 static const ScoreTqReqTimeoutPriorityInherit_Entry
 ScoreTqReqTimeoutPriorityInherit_Entries[] = {
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
-    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
+#if !defined(RTEMS_SMP)
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
+#else
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
+#endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 1, 1, 0,
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 1, 1, 0,
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 1, 1, 0,
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 1, 1, 0,
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 1, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 1, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
-  { 0, 0, 0, 0, 0, 1, 1, 0,
-    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
-    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
-  { 0, 0, 0, 0, 0, 1, 1, 0,
-    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
-    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
-#if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
-#else
-  { 0, 0, 0, 0, 0, 1, 1, 0,
-    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
-    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
-#endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 1, 1, 0,
-    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_Ok,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 1, 1, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_Ok,
-    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
+  { 0, 0, 0, 0, 0, 0, 0, 1, 0,
+    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 1, 1, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_Ok,
+  { 0, 0, 0, 0, 0, 0, 0, 1, 0,
+    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 1, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 1, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
-  { 0, 0, 0, 0, 0, 1, 1, 0,
-    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
-    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
+#if !defined(RTEMS_SMP)
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
-  { 0, 0, 0, 0, 0, 1, 1, 0,
-    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
+#else
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_Ok,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
+#endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Lower },
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Lower },
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Lower },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Lower },
 #endif
-  { 0, 0, 0, 0, 0, 1, 1, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_Ok,
+#if !defined(RTEMS_SMP)
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
+#else
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_Ok,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
-  { 0, 0, 0, 0, 0, 0, 1, 0,
+#endif
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
-  { 0, 0, 0, 0, 0, 0, 1, 0,
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 1, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 1, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #endif
-#if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
-    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
-#else
-  { 0, 0, 0, 0, 0, 1, 1, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_Ok,
-    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
-#endif
-  { 0, 0, 0, 0, 0, 0, 0, 0,
-    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
-    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
-  { 0, 0, 0, 0, 0, 0, 0, 0,
-    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
-    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
-  { 0, 0, 0, 0, 0, 0, 1, 0,
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
-  { 0, 0, 0, 0, 0, 0, 1, 0,
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
-  { 0, 0, 0, 0, 0, 0, 0, 0,
-    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
-    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
-  { 0, 0, 0, 0, 0, 0, 0, 0,
-    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_Ok,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
+  { 0, 0, 0, 0, 0, 0, 0, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Lower },
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
+  { 0, 0, 0, 0, 0, 0, 0, 1, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Lower },
-  { 0, 0, 0, 0, 0, 1, 1, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_Ok,
-    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
-    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
 #endif
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
+  { 0, 0, 0, 0, 0, 0, 0, 1, 0,
+    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
+  { 0, 0, 0, 0, 0, 0, 0, 1, 0,
+    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop },
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Lower },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Lower },
 #endif
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Lower },
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Lower },
+  { 0, 0, 0, 0, 0, 0, 1, 1, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_Ok,
+    ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
+    ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA },
 #else
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_Yes,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Drop },
 #endif
 #if !defined(RTEMS_SMP)
-  { 1, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, ScoreTqReqTimeoutPriorityInherit_Post_Status_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA }
 #else
-  { 0, 0, 0, 0, 0, 0, 0, 0,
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0,
     ScoreTqReqTimeoutPriorityInherit_Post_Status_Timeout,
     ScoreTqReqTimeoutPriorityInherit_Post_Unblock_No,
     ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
@@ -1662,83 +1765,163 @@ ScoreTqReqTimeoutPriorityInherit_Map[] = {
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 2,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0,
-  0, 2, 2, 2, 2, 2, 2, 11, 12, 27, 11, 12, 27, 2, 2, 2, 11, 12, 27, 11, 12, 27,
-  2, 2, 2, 0, 0, 0, 11, 12, 27, 2, 2, 2, 11, 12, 4, 11, 12, 4, 2, 2, 2, 11, 12,
-  4, 11, 12, 4, 2, 2, 2, 0, 0, 0, 11, 12, 4, 2, 2, 2, 28, 29, 4, 28, 29, 4, 2,
-  2, 2, 28, 29, 4, 28, 29, 4, 2, 2, 2, 0, 0, 0, 28, 29, 4, 2, 2, 2, 39, 40, 4,
-  33, 34, 4, 2, 2, 2, 39, 40, 4, 33, 34, 4, 2, 2, 2, 0, 0, 0, 33, 34, 4, 2, 2,
-  2, 0, 0, 0, 21, 22, 41, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 21, 22,
-  41, 2, 2, 2, 0, 0, 0, 21, 22, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0,
-  21, 22, 4, 2, 2, 2, 0, 0, 0, 35, 36, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2,
-  0, 0, 0, 35, 36, 4, 2, 2, 2, 0, 0, 0, 37, 38, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  2, 2, 2, 0, 0, 0, 37, 38, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 2, 2, 2, 2, 2, 2, 11, 12, 27, 11, 12, 27, 2,
-  2, 2, 11, 12, 27, 11, 12, 27, 2, 2, 2, 0, 0, 0, 11, 12, 27, 2, 2, 2, 11, 12,
-  4, 11, 12, 4, 2, 2, 2, 11, 12, 4, 11, 12, 4, 2, 2, 2, 0, 0, 0, 11, 12, 4, 2,
-  2, 2, 28, 29, 4, 28, 29, 4, 2, 2, 2, 28, 29, 4, 28, 29, 4, 2, 2, 2, 0, 0, 0,
-  28, 29, 4, 2, 2, 2, 39, 40, 4, 33, 34, 4, 2, 2, 2, 39, 40, 4, 33, 34, 4, 2,
-  2, 2, 0, 0, 0, 33, 34, 4, 2, 2, 2, 0, 0, 0, 21, 22, 41, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 2, 2, 2, 0, 0, 0, 21, 22, 41, 2, 2, 2, 0, 0, 0, 21, 22, 4, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 21, 22, 4, 2, 2, 2, 0, 0, 0, 35, 36, 4, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 35, 36, 4, 2, 2, 2, 0, 0, 0, 37,
-  38, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 37, 38, 4, 2, 2, 2, 0, 0,
-  0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 2, 2, 2, 2, 2, 2, 0,
-  0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 2, 2, 2, 2, 2, 2,
-  0, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 2, 2, 2, 2, 2,
-  2, 0, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 2, 2, 2, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 2, 2, 2, 2, 2, 2, 5, 6, 12, 5, 6, 12, 2, 2, 2, 5, 6, 12, 5, 6, 12, 2, 2,
+  2, 0, 0, 0, 5, 6, 12, 2, 2, 2, 5, 6, 4, 5, 6, 4, 2, 2, 2, 5, 6, 4, 5, 6, 4,
+  2, 2, 2, 0, 0, 0, 5, 6, 4, 2, 2, 2, 9, 10, 4, 9, 10, 4, 2, 2, 2, 9, 10, 4, 9,
+  10, 4, 2, 2, 2, 0, 0, 0, 9, 10, 4, 2, 2, 2, 22, 23, 4, 20, 21, 4, 2, 2, 2,
+  22, 23, 4, 20, 21, 4, 2, 2, 2, 0, 0, 0, 20, 21, 4, 2, 2, 2, 0, 0, 0, 7, 8,
+  24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 7, 8, 24, 2, 2, 2, 0, 0, 0,
+  7, 8, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 7, 8, 4, 2, 2, 2, 0, 0,
+  0, 13, 14, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 13, 14, 4, 2, 2,
+  2, 0, 0, 0, 15, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 15, 16,
+  4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0,
+  0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+  0, 0, 2, 2, 2, 2, 2, 2, 5, 6, 12, 5, 6, 12, 2, 2, 2, 5, 6, 12, 5, 6, 12, 2,
+  2, 2, 0, 0, 0, 5, 6, 12, 2, 2, 2, 5, 6, 4, 5, 6, 4, 2, 2, 2, 5, 6, 4, 5, 6,
+  4, 2, 2, 2, 0, 0, 0, 5, 6, 4, 2, 2, 2, 9, 10, 4, 9, 10, 4, 2, 2, 2, 9, 10, 4,
+  9, 10, 4, 2, 2, 2, 0, 0, 0, 9, 10, 4, 2, 2, 2, 22, 23, 4, 20, 21, 4, 2, 2, 2,
+  22, 23, 4, 20, 21, 4, 2, 2, 2, 0, 0, 0, 20, 21, 4, 2, 2, 2, 0, 0, 0, 7, 8,
+  24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 7, 8, 24, 2, 2, 2, 0, 0, 0,
+  7, 8, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 7, 8, 4, 2, 2, 2, 0, 0,
+  0, 13, 14, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 13, 14, 4, 2, 2,
+  2, 0, 0, 0, 15, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 15, 16,
+  4, 2, 2, 2, 0, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 2,
+  2, 2, 2, 2, 2, 0, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0,
+  2, 2, 2, 2, 2, 2, 0, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0,
+  0, 2, 2, 2, 2, 2, 2, 0, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0,
+  0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 2, 2, 2, 0, 0, 0, 21, 22, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0,
-  0, 0, 21, 22, 4, 2, 2, 2, 0, 0, 0, 21, 22, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,
-  2, 2, 0, 0, 0, 21, 22, 4, 2, 2, 2, 0, 0, 0, 35, 36, 4, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 2, 2, 2, 0, 0, 0, 35, 36, 4, 2, 2, 2, 0, 0, 0, 37, 38, 4, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 37, 38, 4, 13, 14, 15, 13, 14, 15, 13, 14,
-  15, 13, 14, 15, 13, 14, 15, 13, 14, 15, 13, 14, 15, 1, 1, 1, 13, 14, 15, 13,
-  14, 3, 13, 14, 3, 13, 14, 3, 13, 14, 3, 13, 14, 3, 13, 14, 3, 13, 14, 3, 1,
-  1, 1, 13, 14, 3, 30, 31, 3, 30, 31, 3, 30, 31, 3, 30, 31, 3, 30, 31, 3, 30,
-  31, 3, 30, 31, 3, 1, 1, 1, 30, 31, 3, 46, 47, 3, 44, 45, 3, 42, 43, 3, 44,
-  45, 3, 44, 45, 3, 42, 43, 3, 42, 43, 3, 1, 1, 1, 42, 43, 3, 5, 6, 16, 5, 6,
-  16, 5, 6, 16, 5, 6, 16, 5, 6, 16, 5, 6, 16, 5, 6, 16, 1, 1, 1, 5, 6, 16, 5,
-  6, 3, 5, 6, 3, 5, 6, 3, 5, 6, 3, 5, 6, 3, 5, 6, 3, 5, 6, 3, 1, 1, 1, 5, 6, 3,
-  9, 10, 3, 9, 10, 3, 9, 10, 3, 9, 10, 3, 9, 10, 3, 9, 10, 3, 9, 10, 3, 1, 1,
-  1, 9, 10, 3, 23, 24, 3, 23, 24, 3, 25, 26, 3, 23, 24, 3, 23, 24, 3, 25, 26,
-  3, 25, 26, 3, 1, 1, 1, 25, 26, 3, 7, 8, 32, 1, 1, 1, 7, 8, 32, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 7, 8, 32, 1, 1, 1, 7, 8, 32, 7, 8, 3, 1, 1, 1, 7, 8, 3, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 7, 8, 3, 1, 1, 1, 7, 8, 3, 17, 18, 3, 1, 1, 1, 17, 18, 3,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 17, 18, 3, 1, 1, 1, 17, 18, 3, 19, 20, 3, 1, 1, 1,
-  19, 20, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 19, 20, 3, 1, 1, 1, 19, 20, 3, 5, 6,
-  15, 5, 6, 15, 5, 6, 15, 5, 6, 15, 5, 6, 15, 5, 6, 15, 5, 6, 15, 1, 1, 1, 5,
-  6, 15, 5, 6, 3, 5, 6, 3, 5, 6, 3, 5, 6, 3, 5, 6, 3, 5, 6, 3, 5, 6, 3, 1, 1,
-  1, 5, 6, 3, 9, 10, 3, 9, 10, 3, 9, 10, 3, 9, 10, 3, 9, 10, 3, 9, 10, 3, 9,
-  10, 3, 1, 1, 1, 9, 10, 3, 23, 24, 3, 23, 24, 3, 25, 26, 3, 23, 24, 3, 23, 24,
-  3, 25, 26, 3, 25, 26, 3, 1, 1, 1, 25, 26, 3, 5, 6, 16, 5, 6, 16, 5, 6, 16, 5,
-  6, 16, 5, 6, 16, 5, 6, 16, 5, 6, 16, 1, 1, 1, 5, 6, 16, 5, 6, 3, 5, 6, 3, 5,
-  6, 3, 5, 6, 3, 5, 6, 3, 5, 6, 3, 5, 6, 3, 1, 1, 1, 5, 6, 3, 9, 10, 3, 9, 10,
-  3, 9, 10, 3, 9, 10, 3, 9, 10, 3, 9, 10, 3, 9, 10, 3, 1, 1, 1, 9, 10, 3, 23,
-  24, 3, 23, 24, 3, 25, 26, 3, 23, 24, 3, 23, 24, 3, 25, 26, 3, 25, 26, 3, 1,
-  1, 1, 25, 26, 3, 7, 8, 32, 1, 1, 1, 7, 8, 32, 1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
-  8, 32, 1, 1, 1, 7, 8, 32, 7, 8, 3, 1, 1, 1, 7, 8, 3, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 7, 8, 3, 1, 1, 1, 7, 8, 3, 17, 18, 3, 1, 1, 1, 17, 18, 3, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 17, 18, 3, 1, 1, 1, 17, 18, 3, 19, 20, 3, 1, 1, 1, 19, 20, 3, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 19, 20, 3, 1, 1, 1, 19, 20, 3, 7, 8, 3, 1, 1, 1, 7,
-  8, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 7, 8, 3, 1, 1, 1, 7, 8, 3, 7, 8, 3, 1, 1, 1,
-  7, 8, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 7, 8, 3, 1, 1, 1, 7, 8, 3, 17, 18, 3, 1,
-  1, 1, 17, 18, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 17, 18, 3, 1, 1, 1, 17, 18, 3,
-  19, 20, 3, 1, 1, 1, 19, 20, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 19, 20, 3, 1, 1, 1,
-  19, 20, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 7, 8, 4, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 2, 2, 2, 0, 0, 0, 7, 8, 4, 2, 2, 2, 0, 0, 0, 7, 8, 4, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 2, 2, 2, 0, 0, 0, 7, 8, 4, 2, 2, 2, 0, 0, 0, 13, 14, 4, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 13, 14, 4, 2, 2, 2, 0, 0, 0, 15, 16, 4, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 15, 16, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 3, 3, 3, 3, 3, 3, 25,
+  26, 31, 25, 26, 31, 3, 3, 3, 25, 26, 31, 25, 26, 31, 3, 3, 3, 1, 1, 1, 25,
+  26, 31, 3, 3, 3, 25, 26, 11, 25, 26, 11, 3, 3, 3, 25, 26, 11, 25, 26, 11, 3,
+  3, 3, 1, 1, 1, 25, 26, 11, 3, 3, 3, 32, 33, 11, 32, 33, 11, 3, 3, 3, 32, 33,
+  11, 32, 33, 11, 3, 3, 3, 1, 1, 1, 32, 33, 11, 3, 3, 3, 44, 45, 11, 36, 37,
+  11, 3, 3, 3, 44, 45, 11, 36, 37, 11, 3, 3, 3, 1, 1, 1, 36, 37, 11, 3, 3, 3,
+  1, 1, 1, 29, 30, 46, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 29, 30, 46,
+  3, 3, 3, 1, 1, 1, 29, 30, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1,
+  29, 30, 11, 3, 3, 3, 1, 1, 1, 38, 39, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3,
+  1, 1, 1, 38, 39, 11, 3, 3, 3, 1, 1, 1, 40, 41, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  3, 3, 3, 1, 1, 1, 40, 41, 11, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 3, 3, 3, 3, 3, 3, 25, 26, 31, 25, 26, 31, 3,
+  3, 3, 25, 26, 31, 25, 26, 31, 3, 3, 3, 1, 1, 1, 25, 26, 31, 3, 3, 3, 25, 26,
+  11, 25, 26, 11, 3, 3, 3, 25, 26, 11, 25, 26, 11, 3, 3, 3, 1, 1, 1, 25, 26,
+  11, 3, 3, 3, 32, 33, 11, 32, 33, 11, 3, 3, 3, 32, 33, 11, 32, 33, 11, 3, 3,
+  3, 1, 1, 1, 32, 33, 11, 3, 3, 3, 44, 45, 11, 36, 37, 11, 3, 3, 3, 44, 45, 11,
+  36, 37, 11, 3, 3, 3, 1, 1, 1, 36, 37, 11, 3, 3, 3, 1, 1, 1, 29, 30, 46, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 29, 30, 46, 3, 3, 3, 1, 1, 1, 29, 30,
+  11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 29, 30, 11, 3, 3, 3, 1, 1,
+  1, 38, 39, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 38, 39, 11, 3, 3,
+  3, 1, 1, 1, 40, 41, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 40, 41,
+  11, 3, 3, 3, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1,
+  3, 3, 3, 3, 3, 3, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1,
+  1, 3, 3, 3, 3, 3, 3, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1,
+  1, 1, 3, 3, 3, 3, 3, 3, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3,
+  1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 7, 8, 3, 1, 1, 1, 7, 8, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  7, 8, 3, 1, 1, 1, 7, 8, 3, 7, 8, 3, 1, 1, 1, 7, 8, 3, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 7, 8, 3, 1, 1, 1, 7, 8, 3, 17, 18, 3, 1, 1, 1, 17, 18, 3, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 17, 18, 3, 1, 1, 1, 17, 18, 3, 19, 20, 3, 1, 1, 1, 19, 20, 3, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 19, 20, 3, 1, 1, 1, 19, 20, 3
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 29, 30, 11, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 3, 3, 3, 1, 1, 1, 29, 30, 11, 3, 3, 3, 1, 1, 1, 29, 30, 11, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 29, 30, 11, 3, 3, 3, 1, 1, 1, 38, 39, 11,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 38, 39, 11, 3, 3, 3, 1, 1, 1,
+  40, 41, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 40, 41, 11, 17, 18,
+  19, 17, 18, 19, 17, 18, 19, 17, 18, 19, 17, 18, 19, 17, 18, 19, 17, 18, 19,
+  0, 0, 0, 17, 18, 19, 17, 18, 4, 17, 18, 4, 17, 18, 4, 17, 18, 4, 17, 18, 4,
+  17, 18, 4, 17, 18, 4, 0, 0, 0, 17, 18, 4, 27, 28, 4, 27, 28, 4, 27, 28, 4,
+  27, 28, 4, 27, 28, 4, 27, 28, 4, 27, 28, 4, 0, 0, 0, 27, 28, 4, 47, 48, 4,
+  42, 43, 4, 34, 35, 4, 42, 43, 4, 42, 43, 4, 34, 35, 4, 34, 35, 4, 0, 0, 0,
+  34, 35, 4, 5, 6, 12, 5, 6, 12, 5, 6, 12, 5, 6, 12, 5, 6, 12, 5, 6, 12, 5, 6,
+  12, 0, 0, 0, 5, 6, 12, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4,
+  5, 6, 4, 0, 0, 0, 5, 6, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4,
+  9, 10, 4, 9, 10, 4, 0, 0, 0, 9, 10, 4, 22, 23, 4, 22, 23, 4, 20, 21, 4, 22,
+  23, 4, 22, 23, 4, 20, 21, 4, 20, 21, 4, 0, 0, 0, 20, 21, 4, 7, 8, 24, 0, 0,
+  0, 7, 8, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 24, 0, 0, 0, 7, 8, 24, 7, 8, 4,
+  0, 0, 0, 7, 8, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0, 7, 8, 4, 13,
+  14, 4, 0, 0, 0, 13, 14, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 14, 4, 0, 0, 0, 13,
+  14, 4, 15, 16, 4, 0, 0, 0, 15, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 16, 4,
+  0, 0, 0, 15, 16, 4, 5, 6, 19, 5, 6, 19, 5, 6, 19, 5, 6, 19, 5, 6, 19, 5, 6,
+  19, 5, 6, 19, 0, 0, 0, 5, 6, 19, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4,
+  5, 6, 4, 5, 6, 4, 0, 0, 0, 5, 6, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4,
+  9, 10, 4, 9, 10, 4, 9, 10, 4, 0, 0, 0, 9, 10, 4, 22, 23, 4, 22, 23, 4, 20,
+  21, 4, 22, 23, 4, 22, 23, 4, 20, 21, 4, 20, 21, 4, 0, 0, 0, 20, 21, 4, 5, 6,
+  12, 5, 6, 12, 5, 6, 12, 5, 6, 12, 5, 6, 12, 5, 6, 12, 5, 6, 12, 0, 0, 0, 5,
+  6, 12, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 0, 0,
+  0, 5, 6, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9,
+  10, 4, 0, 0, 0, 9, 10, 4, 22, 23, 4, 22, 23, 4, 20, 21, 4, 22, 23, 4, 22, 23,
+  4, 20, 21, 4, 20, 21, 4, 0, 0, 0, 20, 21, 4, 7, 8, 24, 0, 0, 0, 7, 8, 24, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 24, 0, 0, 0, 7, 8, 24, 7, 8, 4, 0, 0, 0, 7, 8,
+  4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0, 7, 8, 4, 13, 14, 4, 0, 0, 0,
+  13, 14, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 14, 4, 0, 0, 0, 13, 14, 4, 15, 16,
+  4, 0, 0, 0, 15, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 16, 4, 0, 0, 0, 15, 16,
+  4, 7, 8, 4, 0, 0, 0, 7, 8, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0, 7,
+  8, 4, 7, 8, 4, 0, 0, 0, 7, 8, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0,
+  7, 8, 4, 13, 14, 4, 0, 0, 0, 13, 14, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 14, 4,
+  0, 0, 0, 13, 14, 4, 15, 16, 4, 0, 0, 0, 15, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  15, 16, 4, 0, 0, 0, 15, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0, 7, 8, 4, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0, 7, 8, 4, 7, 8, 4, 0, 0, 0, 7, 8, 4, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0, 7, 8, 4, 13, 14, 4, 0, 0, 0, 13,
+  14, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 14, 4, 0, 0, 0, 13, 14, 4, 15, 16, 4,
+  0, 0, 0, 15, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 16, 4, 0, 0, 0, 15, 16, 4,
+  17, 18, 19, 17, 18, 19, 17, 18, 19, 17, 18, 19, 17, 18, 19, 17, 18, 19, 17,
+  18, 19, 0, 0, 0, 17, 18, 19, 17, 18, 4, 17, 18, 4, 17, 18, 4, 17, 18, 4, 17,
+  18, 4, 17, 18, 4, 17, 18, 4, 0, 0, 0, 17, 18, 4, 27, 28, 4, 27, 28, 4, 27,
+  28, 4, 27, 28, 4, 27, 28, 4, 27, 28, 4, 27, 28, 4, 0, 0, 0, 27, 28, 4, 47,
+  48, 4, 42, 43, 4, 34, 35, 4, 42, 43, 4, 42, 43, 4, 34, 35, 4, 34, 35, 4, 0,
+  0, 0, 34, 35, 4, 5, 6, 12, 5, 6, 12, 5, 6, 12, 5, 6, 12, 5, 6, 12, 5, 6, 12,
+  5, 6, 12, 0, 0, 0, 5, 6, 12, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5,
+  6, 4, 5, 6, 4, 0, 0, 0, 5, 6, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9,
+  10, 4, 9, 10, 4, 9, 10, 4, 0, 0, 0, 9, 10, 4, 22, 23, 4, 22, 23, 4, 20, 21,
+  4, 22, 23, 4, 22, 23, 4, 20, 21, 4, 20, 21, 4, 0, 0, 0, 20, 21, 4, 7, 8, 24,
+  0, 0, 0, 7, 8, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 24, 0, 0, 0, 7, 8, 24, 7,
+  8, 4, 0, 0, 0, 7, 8, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0, 7, 8, 4,
+  13, 14, 4, 0, 0, 0, 13, 14, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 14, 4, 0, 0, 0,
+  13, 14, 4, 15, 16, 4, 0, 0, 0, 15, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 16,
+  4, 0, 0, 0, 15, 16, 4, 5, 6, 19, 5, 6, 19, 5, 6, 19, 5, 6, 19, 5, 6, 19, 5,
+  6, 19, 5, 6, 19, 0, 0, 0, 5, 6, 19, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6,
+  4, 5, 6, 4, 5, 6, 4, 0, 0, 0, 5, 6, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9, 10,
+  4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 0, 0, 0, 9, 10, 4, 22, 23, 4, 22, 23, 4, 20,
+  21, 4, 22, 23, 4, 22, 23, 4, 20, 21, 4, 20, 21, 4, 0, 0, 0, 20, 21, 4, 5, 6,
+  12, 5, 6, 12, 5, 6, 12, 5, 6, 12, 5, 6, 12, 5, 6, 12, 5, 6, 12, 0, 0, 0, 5,
+  6, 12, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 0, 0,
+  0, 5, 6, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9, 10, 4, 9,
+  10, 4, 0, 0, 0, 9, 10, 4, 22, 23, 4, 22, 23, 4, 20, 21, 4, 22, 23, 4, 22, 23,
+  4, 20, 21, 4, 20, 21, 4, 0, 0, 0, 20, 21, 4, 7, 8, 24, 0, 0, 0, 7, 8, 24, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 24, 0, 0, 0, 7, 8, 24, 7, 8, 4, 0, 0, 0, 7, 8,
+  4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0, 7, 8, 4, 13, 14, 4, 0, 0, 0,
+  13, 14, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 14, 4, 0, 0, 0, 13, 14, 4, 15, 16,
+  4, 0, 0, 0, 15, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 16, 4, 0, 0, 0, 15, 16,
+  4, 7, 8, 4, 0, 0, 0, 7, 8, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0, 7,
+  8, 4, 7, 8, 4, 0, 0, 0, 7, 8, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0,
+  7, 8, 4, 13, 14, 4, 0, 0, 0, 13, 14, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 14, 4,
+  0, 0, 0, 13, 14, 4, 15, 16, 4, 0, 0, 0, 15, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  15, 16, 4, 0, 0, 0, 15, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0, 7, 8, 4, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0, 7, 8, 4, 7, 8, 4, 0, 0, 0, 7, 8, 4, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 7, 8, 4, 0, 0, 0, 7, 8, 4, 13, 14, 4, 0, 0, 0, 13,
+  14, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 14, 4, 0, 0, 0, 13, 14, 4, 15, 16, 4,
+  0, 0, 0, 15, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 16, 4, 0, 0, 0, 15, 16, 4
 };
 
 static size_t ScoreTqReqTimeoutPriorityInherit_Scope(
@@ -1793,20 +1976,21 @@ static void ScoreTqReqTimeoutPriorityInherit_SetPreConditionStates(
   ctx->Map.pcs[ 1 ] = ctx->Map.pci[ 1 ];
   ctx->Map.pcs[ 2 ] = ctx->Map.pci[ 2 ];
   ctx->Map.pcs[ 3 ] = ctx->Map.pci[ 3 ];
+  ctx->Map.pcs[ 4 ] = ctx->Map.pci[ 4 ];
 
   if ( ctx->Map.entry.Pre_OwnerQueue_NA ) {
-    ctx->Map.pcs[ 4 ] = ScoreTqReqTimeoutPriorityInherit_Pre_OwnerQueue_NA;
+    ctx->Map.pcs[ 5 ] = ScoreTqReqTimeoutPriorityInherit_Pre_OwnerQueue_NA;
   } else {
-    ctx->Map.pcs[ 4 ] = ctx->Map.pci[ 4 ];
+    ctx->Map.pcs[ 5 ] = ctx->Map.pci[ 5 ];
   }
 
   if ( ctx->Map.entry.Pre_OwnerOwnerPriority_NA ) {
-    ctx->Map.pcs[ 5 ] = ScoreTqReqTimeoutPriorityInherit_Pre_OwnerOwnerPriority_NA;
+    ctx->Map.pcs[ 6 ] = ScoreTqReqTimeoutPriorityInherit_Pre_OwnerOwnerPriority_NA;
   } else {
-    ctx->Map.pcs[ 5 ] = ctx->Map.pci[ 5 ];
+    ctx->Map.pcs[ 6 ] = ctx->Map.pci[ 6 ];
   }
 
-  ctx->Map.pcs[ 6 ] = ctx->Map.pci[ 6 ];
+  ctx->Map.pcs[ 7 ] = ctx->Map.pci[ 7 ];
 }
 
 static void ScoreTqReqTimeoutPriorityInherit_TestVariant(
@@ -1817,26 +2001,30 @@ static void ScoreTqReqTimeoutPriorityInherit_TestVariant(
     ctx,
     ctx->Map.pcs[ 0 ]
   );
-  ScoreTqReqTimeoutPriorityInherit_Pre_Queue_Prepare( ctx, ctx->Map.pcs[ 1 ] );
+  ScoreTqReqTimeoutPriorityInherit_Pre_OtherScheduler_Prepare(
+    ctx,
+    ctx->Map.pcs[ 1 ]
+  );
+  ScoreTqReqTimeoutPriorityInherit_Pre_Queue_Prepare( ctx, ctx->Map.pcs[ 2 ] );
   ScoreTqReqTimeoutPriorityInherit_Pre_OwnerPriority_Prepare(
     ctx,
-    ctx->Map.pcs[ 2 ]
+    ctx->Map.pcs[ 3 ]
   );
   ScoreTqReqTimeoutPriorityInherit_Pre_OwnerState_Prepare(
     ctx,
-    ctx->Map.pcs[ 3 ]
+    ctx->Map.pcs[ 4 ]
   );
   ScoreTqReqTimeoutPriorityInherit_Pre_OwnerQueue_Prepare(
     ctx,
-    ctx->Map.pcs[ 4 ]
+    ctx->Map.pcs[ 5 ]
   );
   ScoreTqReqTimeoutPriorityInherit_Pre_OwnerOwnerPriority_Prepare(
     ctx,
-    ctx->Map.pcs[ 5 ]
+    ctx->Map.pcs[ 6 ]
   );
   ScoreTqReqTimeoutPriorityInherit_Pre_WaitState_Prepare(
     ctx,
-    ctx->Map.pcs[ 6 ]
+    ctx->Map.pcs[ 7 ]
   );
   ScoreTqReqTimeoutPriorityInherit_Action( ctx );
   ScoreTqReqTimeoutPriorityInherit_Post_Status_Check(
@@ -1879,47 +2067,55 @@ void ScoreTqReqTimeoutPriorityInherit_Run( TQContext *tq_ctx )
     ++ctx->Map.pci[ 0 ]
   ) {
     for (
-      ctx->Map.pci[ 1 ] = ScoreTqReqTimeoutPriorityInherit_Pre_Queue_Only;
-      ctx->Map.pci[ 1 ] < ScoreTqReqTimeoutPriorityInherit_Pre_Queue_NA;
+      ctx->Map.pci[ 1 ] = ScoreTqReqTimeoutPriorityInherit_Pre_OtherScheduler_Yes;
+      ctx->Map.pci[ 1 ] < ScoreTqReqTimeoutPriorityInherit_Pre_OtherScheduler_NA;
       ++ctx->Map.pci[ 1 ]
     ) {
       for (
-        ctx->Map.pci[ 2 ] = ScoreTqReqTimeoutPriorityInherit_Pre_OwnerPriority_Only;
-        ctx->Map.pci[ 2 ] < ScoreTqReqTimeoutPriorityInherit_Pre_OwnerPriority_NA;
+        ctx->Map.pci[ 2 ] = ScoreTqReqTimeoutPriorityInherit_Pre_Queue_Only;
+        ctx->Map.pci[ 2 ] < ScoreTqReqTimeoutPriorityInherit_Pre_Queue_NA;
         ++ctx->Map.pci[ 2 ]
       ) {
         for (
-          ctx->Map.pci[ 3 ] = ScoreTqReqTimeoutPriorityInherit_Pre_OwnerState_NotEnqueued;
-          ctx->Map.pci[ 3 ] < ScoreTqReqTimeoutPriorityInherit_Pre_OwnerState_NA;
+          ctx->Map.pci[ 3 ] = ScoreTqReqTimeoutPriorityInherit_Pre_OwnerPriority_Only;
+          ctx->Map.pci[ 3 ] < ScoreTqReqTimeoutPriorityInherit_Pre_OwnerPriority_NA;
           ++ctx->Map.pci[ 3 ]
         ) {
           for (
-            ctx->Map.pci[ 4 ] = ScoreTqReqTimeoutPriorityInherit_Pre_OwnerQueue_Only;
-            ctx->Map.pci[ 4 ] < ScoreTqReqTimeoutPriorityInherit_Pre_OwnerQueue_NA;
+            ctx->Map.pci[ 4 ] = ScoreTqReqTimeoutPriorityInherit_Pre_OwnerState_NotEnqueued;
+            ctx->Map.pci[ 4 ] < ScoreTqReqTimeoutPriorityInherit_Pre_OwnerState_NA;
             ++ctx->Map.pci[ 4 ]
           ) {
             for (
-              ctx->Map.pci[ 5 ] = ScoreTqReqTimeoutPriorityInherit_Pre_OwnerOwnerPriority_Only;
-              ctx->Map.pci[ 5 ] < ScoreTqReqTimeoutPriorityInherit_Pre_OwnerOwnerPriority_NA;
+              ctx->Map.pci[ 5 ] = ScoreTqReqTimeoutPriorityInherit_Pre_OwnerQueue_Only;
+              ctx->Map.pci[ 5 ] < ScoreTqReqTimeoutPriorityInherit_Pre_OwnerQueue_NA;
               ++ctx->Map.pci[ 5 ]
             ) {
               for (
-                ctx->Map.pci[ 6 ] = ScoreTqReqTimeoutPriorityInherit_Pre_WaitState_Blocked;
-                ctx->Map.pci[ 6 ] < ScoreTqReqTimeoutPriorityInherit_Pre_WaitState_NA;
+                ctx->Map.pci[ 6 ] = ScoreTqReqTimeoutPriorityInherit_Pre_OwnerOwnerPriority_Only;
+                ctx->Map.pci[ 6 ] < ScoreTqReqTimeoutPriorityInherit_Pre_OwnerOwnerPriority_NA;
                 ++ctx->Map.pci[ 6 ]
               ) {
-                ctx->Map.entry = ScoreTqReqTimeoutPriorityInherit_PopEntry(
-                  ctx
-                );
-
-                if ( ctx->Map.entry.Skip ) {
-                  continue;
+                for (
+                  ctx->Map.pci[ 7 ] = ScoreTqReqTimeoutPriorityInherit_Pre_WaitState_Blocked;
+                  ctx->Map.pci[ 7 ] < ScoreTqReqTimeoutPriorityInherit_Pre_WaitState_NA;
+                  ++ctx->Map.pci[ 7 ]
+                ) {
+                  ctx->Map.entry = ScoreTqReqTimeoutPriorityInherit_PopEntry(
+                    ctx
+                  );
+
+                  if ( ctx->Map.entry.Skip ) {
+                    continue;
+                  }
+
+                  ScoreTqReqTimeoutPriorityInherit_SetPreConditionStates(
+                    ctx
+                  );
+                  ScoreTqReqTimeoutPriorityInherit_Prepare( ctx );
+                  ScoreTqReqTimeoutPriorityInherit_TestVariant( ctx );
+                  ScoreTqReqTimeoutPriorityInherit_Cleanup( ctx );
                 }
-
-                ScoreTqReqTimeoutPriorityInherit_SetPreConditionStates( ctx );
-                ScoreTqReqTimeoutPriorityInherit_Prepare( ctx );
-                ScoreTqReqTimeoutPriorityInherit_TestVariant( ctx );
-                ScoreTqReqTimeoutPriorityInherit_Cleanup( ctx );
               }
             }
           }
diff --git a/testsuites/validation/tr-tq-timeout-priority-inherit.h b/testsuites/validation/tr-tq-timeout-priority-inherit.h
index 71846b40aa..01b19bb0b2 100644
--- a/testsuites/validation/tr-tq-timeout-priority-inherit.h
+++ b/testsuites/validation/tr-tq-timeout-priority-inherit.h
@@ -70,6 +70,12 @@ typedef enum {
 } ScoreTqReqTimeoutPriorityInherit_Pre_Scheduler;
 
 typedef enum {
+  ScoreTqReqTimeoutPriorityInherit_Pre_OtherScheduler_Yes,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OtherScheduler_No,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OtherScheduler_NA
+} ScoreTqReqTimeoutPriorityInherit_Pre_OtherScheduler;
+
+typedef enum {
   ScoreTqReqTimeoutPriorityInherit_Pre_Queue_Only,
   ScoreTqReqTimeoutPriorityInherit_Pre_Queue_Vital,
   ScoreTqReqTimeoutPriorityInherit_Pre_Queue_Dispensable,