181,187c181,187
< w->workgroupsz[0] = ndr->q.wgSize[0];
< w->workgroupsz[1] = ndr->q.wgSize[1];
< w->workgroupsz[2] = ndr->q.wgSize[2];
< w->wg_sz = w->workgroupsz[0] * w->workgroupsz[1] * w->workgroupsz[2];
< w->gridsz[0] = ndr->q.gdSize[0];
< w->gridsz[1] = ndr->q.gdSize[1];
< w->gridsz[2] = ndr->q.gdSize[2];
---
> w->workGroupSz[0] = ndr->q.wgSize[0];
> w->workGroupSz[1] = ndr->q.wgSize[1];
> w->workGroupSz[2] = ndr->q.wgSize[2];
> w->wgSz = w->workGroupSz[0] * w->workGroupSz[1] * w->workGroupSz[2];
> w->gridSz[0] = ndr->q.gdSize[0];
> w->gridSz[1] = ndr->q.gdSize[1];
> w->gridSz[2] = ndr->q.gdSize[2];
239,241c239,241
< w->kern_id = ndr->dispatchId;
< w->dynwaveid = cnt;
< w->init_mask = init_mask.to_ullong();
---
> w->kernId = ndr->dispatchId;
> w->dynWaveId = cnt;
> w->initMask = init_mask.to_ullong();
244,245c244,245
< w->workitemid[0][k] = (k+cnt*wfSize()) % trueWgSize[0];
< w->workitemid[1][k] =
---
> w->workItemId[0][k] = (k+cnt*wfSize()) % trueWgSize[0];
> w->workItemId[1][k] =
247c247
< w->workitemid[2][k] =
---
> w->workItemId[2][k] =
250,252c250,252
< w->workitemFlatId[k] = w->workitemid[2][k] * trueWgSize[0] *
< trueWgSize[1] + w->workitemid[1][k] * trueWgSize[0] +
< w->workitemid[0][k];
---
> w->workItemFlatId[k] = w->workItemId[2][k] * trueWgSize[0] *
> trueWgSize[1] + w->workItemId[1][k] * trueWgSize[0] +
> w->workItemId[0][k];
255c255
< w->barrier_slots = divCeil(trueWgSizeTotal, wfSize());
---
> w->barrierSlots = divCeil(trueWgSizeTotal, wfSize());
257c257
< w->bar_cnt.resize(wfSize(), 0);
---
> w->barCnt.resize(wfSize(), 0);
259,261c259,261
< w->max_bar_cnt = 0;
< w->old_barrier_cnt = 0;
< w->barrier_cnt = 0;
---
> w->maxBarCnt = 0;
> w->oldBarrierCnt = 0;
> w->barrierCnt = 0;
272,276c272,276
< w->wg_id = ndr->globalWgId;
< w->dispatchid = ndr->dispatchId;
< w->workgroupid[0] = w->wg_id % ndr->numWg[0];
< w->workgroupid[1] = (w->wg_id / ndr->numWg[0]) % ndr->numWg[1];
< w->workgroupid[2] = w->wg_id / (ndr->numWg[0] * ndr->numWg[1]);
---
> w->wgId = ndr->globalWgId;
> w->dispatchId = ndr->dispatchId;
> w->workGroupId[0] = w->wgId % ndr->numWg[0];
> w->workGroupId[1] = (w->wgId / ndr->numWg[0]) % ndr->numWg[1];
> w->workGroupId[2] = w->wgId / (ndr->numWg[0] * ndr->numWg[1]);
278c278
< w->barrier_id = barrier_id;
---
> w->barrierId = barrier_id;
285c285
< lds.increaseRefCounter(w->dispatchid, w->wg_id);
---
> lds.increaseRefCounter(w->dispatchId, w->wgId);
287c287
< cu_id, w->wg_id, refCount);
---
> cu_id, w->wgId, refCount);
471c471
< w->barrier_id, _barrier_id);
---
> w->barrierId, _barrier_id);
474c474
< w->barrier_cnt, bcnt);
---
> w->barrierCnt, bcnt);
478,479c478,479
< w->barrier_id == _barrier_id && w->barrier_cnt == bcnt &&
< !w->outstanding_reqs) {
---
> w->barrierId == _barrier_id && w->barrierCnt == bcnt &&
> !w->outstandingReqs) {
649c649
< w->wfDynId, w->kern_id);
---
> w->wfDynId, w->kernId);
654c654
< w->outstanding_reqs--;
---
> w->outstandingReqs--;
659c659
< gpuDynInst->wfSlotId, w->barrier_cnt);
---
> gpuDynInst->wfSlotId, w->barrierCnt);