Fix OpenCL test crash on some devices

Replace constexpr with const in kernel source
codes because some kernel compiler doesn't
support constexpr.

Replace scheduler with __amd_rocclr_scheduler
due to name change.

Change-Id: I1ad4ddcdf1df5237b83e1ea2447eb39a19f7dc4a
Этот коммит содержится в:
Tao Sang
2020-08-28 13:00:21 -04:00
коммит произвёл Tao Sang
родитель bc5b9c853a
Коммит 9c5465f9e1
+12 -12
Просмотреть файл
@@ -164,17 +164,17 @@ typedef struct _HwDispatch {
uint padd41; // 0x00000021
} HwDispatch;
\n
static constexpr uint WavefrontSize = 64;
static constexpr uint MaxWaveSize = 0x400;
static constexpr uint UsrRegOffset = 0x240;
static constexpr uint Pm4Nop = 0xC0001002;
static constexpr uint Pm4UserRegs = 0xC0007602;
static constexpr uint Pm4CopyReg = 0xC0044000;
static constexpr uint PrivateSegEna = 0x1;
static constexpr uint DispatchEna = 0x2;
static constexpr uint QueuePtrEna = 0x4;
static constexpr uint KernelArgEna = 0x8;
static constexpr uint FlatScratchEna = 0x20;
static const uint WavefrontSize = 64;
static const uint MaxWaveSize = 0x400;
static const uint UsrRegOffset = 0x240;
static const uint Pm4Nop = 0xC0001002;
static const uint Pm4UserRegs = 0xC0007602;
static const uint Pm4CopyReg = 0xC0044000;
static const uint PrivateSegEna = 0x1;
static const uint DispatchEna = 0x2;
static const uint QueuePtrEna = 0x4;
static const uint KernelArgEna = 0x8;
static const uint FlatScratchEna = 0x20;
\n
uint GetCmdTemplateHeaderSize() { return sizeof(HwDispatchHeader); }
\n
@@ -297,7 +297,7 @@ void RunCmdTemplateDispatch(
}
\n
__kernel void
scheduler(
__amd_rocclr_scheduler(
__global void * queue,
__global void * params,
uint paramIdx)