Change ThreadArbitrationPolicy enum type to int32_t

Change ThreadArbitrationPolicy::NotPresent value to -1
Update initial values to ThreadArbitrationPolicy::NotPresent

Related-To: NEO-6728

Signed-off-by: Filip Hazubski <[email protected]>

Author: fhazubski-Intel

level_zero/core/source/cmdlist/cmdlist.h

@@ -188,7 +188,7 @@ struct CommandList : _ze_command_list_handle_t {
         return commandListPreemptionMode;
     }
 
-    uint32_t getThreadArbitrationPolicy() const {
+    int32_t getThreadArbitrationPolicy() const {
         return threadArbitrationPolicy;
     }
 
@@ -256,7 +256,7 @@ struct CommandList : _ze_command_list_handle_t {
     uint32_t cmdListType = CommandListType::TYPE_REGULAR;
     uint32_t commandListPerThreadScratchSize = 0u;
     uint32_t commandListPerThreadPrivateScratchSize = 0u;
-    uint32_t threadArbitrationPolicy = NEO::ThreadArbitrationPolicy::RoundRobin;
+    int32_t threadArbitrationPolicy = NEO::ThreadArbitrationPolicy::NotPresent;
     uint32_t partitionCount = 1;
     bool isFlushTaskSubmissionEnabled = false;
     bool isSyncModeQueue = false;

level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl

@@ -211,7 +211,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithParams(z
     }
 
     KernelImp *kernelImp = static_cast<KernelImp *>(kernel);
-    if (kernelImp->getSchedulingHintExp() != std::numeric_limits<uint32_t>::max()) {
+    if (kernelImp->getSchedulingHintExp() != NEO::ThreadArbitrationPolicy::NotPresent) {
         this->threadArbitrationPolicy = kernelImp->getSchedulingHintExp();
     }
 

level_zero/core/source/device/device_imp.cpp

@@ -456,7 +456,7 @@ ze_result_t DeviceImp::getKernelProperties(ze_device_module_properties_t *pKerne
                 reinterpret_cast<ze_scheduling_hint_exp_properties_t *>(extendedProperties);
             auto supportedThreadArbitrationPolicies = hwInfoConfig.getKernelSupportedThreadArbitrationPolicies();
             hintProperties->schedulingHintFlags = 0;
-            for (uint32_t &p : supportedThreadArbitrationPolicies) {
+            for (auto &p : supportedThreadArbitrationPolicies) {
                 switch (p) {
                 case NEO::ThreadArbitrationPolicy::AgeBased:
                     hintProperties->schedulingHintFlags |= ZE_SCHEDULING_HINT_EXP_FLAG_OLDEST_FIRST;

level_zero/core/source/kernel/kernel_imp.cpp

@@ -1013,7 +1013,7 @@ ze_result_t KernelImp::setSchedulingHintExp(ze_scheduling_hint_exp_desc_t *pHint
     return ZE_RESULT_SUCCESS;
 }
 
-uint32_t KernelImp::getSchedulingHintExp() {
+int32_t KernelImp::getSchedulingHintExp() {
     if (NEO::DebugManager.flags.OverrideThreadArbitrationPolicy.get() != -1) {
         this->schedulingHintExpFlag = static_cast<uint32_t>(NEO::DebugManager.flags.OverrideThreadArbitrationPolicy.get());
     }

level_zero/core/source/kernel/kernel_imp.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "shared/source/command_stream/thread_arbitration_policy.h"
 #include "shared/source/kernel/dispatch_kernel_encoder_interface.h"
 #include "shared/source/unified_memory/unified_memory.h"
 
@@ -151,7 +152,7 @@ struct KernelImp : Kernel {
     }
 
     ze_result_t setSchedulingHintExp(ze_scheduling_hint_exp_desc_t *pHint) override;
-    uint32_t getSchedulingHintExp();
+    int32_t getSchedulingHintExp();
 
     NEO::ImplicitArgs *getImplicitArgs() const override { return pImplicitArgs.get(); }
 
@@ -210,7 +211,7 @@ struct KernelImp : Kernel {
 
     bool kernelHasIndirectAccess = true;
 
-    uint32_t schedulingHintExpFlag = std::numeric_limits<uint32_t>::max();
+    int32_t schedulingHintExpFlag = NEO::ThreadArbitrationPolicy::NotPresent;
     std::unique_ptr<NEO::ImplicitArgs> pImplicitArgs;
 };
 

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp

@@ -114,7 +114,7 @@ HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithThreadArbitrationPolicySe
     auto result = commandList->appendLaunchKernel(kernel->toHandle(), &groupCount, nullptr, 0, nullptr);
 
     ASSERT_EQ(ZE_RESULT_SUCCESS, result);
-    ASSERT_EQ(commandList->threadArbitrationPolicy, 0u);
+    ASSERT_EQ(0, commandList->threadArbitrationPolicy);
     delete (pHint);
 }
 

level_zero/core/test/unit_tests/sources/device/test_device.cpp

@@ -785,7 +785,7 @@ HWTEST_F(DeviceTest, whenPassingSchedulingHintExpStructToGetPropertiesThenProper
 
     EXPECT_NE(ZE_SCHEDULING_HINT_EXP_FLAG_FORCE_UINT32, schedulingHintProperties.schedulingHintFlags);
     auto supportedThreadArbitrationPolicies = NEO::PreambleHelper<FamilyType>::getSupportedThreadArbitrationPolicies();
-    for (uint32_t &p : supportedThreadArbitrationPolicies) {
+    for (auto &p : supportedThreadArbitrationPolicies) {
         switch (p) {
         case ThreadArbitrationPolicy::AgeBased:
             EXPECT_NE(0u, (schedulingHintProperties.schedulingHintFlags &
@@ -807,10 +807,10 @@ HWTEST_F(DeviceTest, whenPassingSchedulingHintExpStructToGetPropertiesThenProper
 
 HWTEST2_F(DeviceTest, givenAllThreadArbitrationPoliciesWhenPassingSchedulingHintExpStructToGetPropertiesThenPropertiesWithAllFlagsAreReturned, MatchAny) {
     struct MockHwInfoConfig : NEO::HwInfoConfigHw<productFamily> {
-        std::vector<uint32_t> getKernelSupportedThreadArbitrationPolicies() override {
+        std::vector<int32_t> getKernelSupportedThreadArbitrationPolicies() override {
             return threadArbPolicies;
         }
-        std::vector<uint32_t> threadArbPolicies;
+        std::vector<int32_t> threadArbPolicies;
     };
 
     const uint32_t rootDeviceIndex = 0u;
@@ -847,10 +847,10 @@ HWTEST2_F(DeviceTest, givenAllThreadArbitrationPoliciesWhenPassingSchedulingHint
 
 HWTEST2_F(DeviceTest, givenIncorrectThreadArbitrationPolicyWhenPassingSchedulingHintExpStructToGetPropertiesThenNoneIsReturned, MatchAny) {
     struct MockHwInfoConfig : NEO::HwInfoConfigHw<productFamily> {
-        std::vector<uint32_t> getKernelSupportedThreadArbitrationPolicies() override {
+        std::vector<int32_t> getKernelSupportedThreadArbitrationPolicies() override {
             return threadArbPolicies;
         }
-        std::vector<uint32_t> threadArbPolicies;
+        std::vector<int32_t> threadArbPolicies;
     };
 
     const uint32_t rootDeviceIndex = 0u;

opencl/source/kernel/kernel.h

@@ -309,7 +309,7 @@ class Kernel : public ReferenceTrackedObject<Kernel> {
 
     bool isBuiltIn = false;
 
-    uint32_t getThreadArbitrationPolicy() const {
+    int32_t getThreadArbitrationPolicy() const {
         return threadArbitrationPolicy;
     }
     KernelExecutionType getExecutionType() const {
@@ -352,7 +352,7 @@ class Kernel : public ReferenceTrackedObject<Kernel> {
     bool areStatelessWritesUsed() { return containsStatelessWrites; }
     int setKernelThreadArbitrationPolicy(uint32_t propertyValue);
     cl_int setKernelExecutionType(cl_execution_info_kernel_type_intel executionType);
-    void setThreadArbitrationPolicy(uint32_t policy) {
+    void setThreadArbitrationPolicy(int32_t policy) {
         this->threadArbitrationPolicy = policy;
     }
     void getSuggestedLocalWorkSize(const cl_uint workDim, const size_t *globalWorkSize, const size_t *globalWorkOffset,
@@ -455,7 +455,7 @@ class Kernel : public ReferenceTrackedObject<Kernel> {
     uint32_t patchedArgumentsNum = 0;
     uint32_t startOffset = 0;
     uint32_t statelessUncacheableArgsCount = 0;
-    uint32_t threadArbitrationPolicy = ThreadArbitrationPolicy::NotPresent;
+    int32_t threadArbitrationPolicy = ThreadArbitrationPolicy::NotPresent;
     KernelExecutionType executionType = KernelExecutionType::Default;
 
     std::vector<PatchInfoData> patchInfoDataList;

opencl/source/xe_hp_core/cl_hw_helper_xe_hp_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -59,7 +59,7 @@ bool ClHwHelperHw<Family>::isSupportedKernelThreadArbitrationPolicy() const { re
 
 template <>
 std::vector<uint32_t> ClHwHelperHw<Family>::getSupportedThreadArbitrationPolicies() const {
-    return std::vector<uint32_t>{};
+    return {};
 }
 
 template <>

opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -46,7 +46,7 @@ bool ClHwHelperHw<Family>::requiresAuxResolves(const KernelInfo &kernelInfo, con
 
 template <>
 std::vector<uint32_t> ClHwHelperHw<Family>::getSupportedThreadArbitrationPolicies() const {
-    return std::vector<uint32_t>{};
+    return {};
 }
 
 template <>