55c55
< last_trace = 0;
---
> lastTrace = 0;
61,70c61,70
< outstanding_reqs = 0;
< mem_reqs_in_pipe = 0;
< outstanding_reqs_wr_gm = 0;
< outstanding_reqs_wr_lm = 0;
< outstanding_reqs_rd_gm = 0;
< outstanding_reqs_rd_lm = 0;
< rd_lm_reqs_in_pipe = 0;
< rd_gm_reqs_in_pipe = 0;
< wr_lm_reqs_in_pipe = 0;
< wr_gm_reqs_in_pipe = 0;
---
> outstandingReqs = 0;
> memReqsInPipe = 0;
> outstandingReqsWrGm = 0;
> outstandingReqsWrLm = 0;
> outstandingReqsRdGm = 0;
> outstandingReqsRdLm = 0;
> rdLmReqsInPipe = 0;
> rdGmReqsInPipe = 0;
> wrLmReqsInPipe = 0;
> wrGmReqsInPipe = 0;
72,73c72,73
< barrier_cnt = 0;
< old_barrier_cnt = 0;
---
> barrierCnt = 0;
> oldBarrierCnt = 0;
76,79c76,79
< mem_trace_busy = 0;
< old_vgpr_tcnt = 0xffffffffffffffffll;
< old_dgpr_tcnt = 0xffffffffffffffffll;
< old_vgpr.resize(p->wfSize);
---
> memTraceBusy = 0;
> oldVgprTcnt = 0xffffffffffffffffll;
> oldDgprTcnt = 0xffffffffffffffffll;
> oldVgpr.resize(p->wfSize);
86,89c86,89
< last_addr.resize(p->wfSize);
< workitemFlatId.resize(p->wfSize);
< old_dgpr.resize(p->wfSize);
< bar_cnt.resize(p->wfSize);
---
> lastAddr.resize(p->wfSize);
> workItemFlatId.resize(p->wfSize);
> oldDgpr.resize(p->wfSize);
> barCnt.resize(p->wfSize);
91c91
< workitemid[i].resize(p->wfSize);
---
> workItemId[i].resize(p->wfSize);
161c161
< base_ptr = _base_ptr;
---
> basePtr = _base_ptr;
336,337c336,337
< if (!computeUnit->AllAtBarrier(barrier_id,barrier_cnt,
< computeUnit->getRefCounter(dispatchid, wg_id))) {
---
> if (!computeUnit->AllAtBarrier(barrierId,barrierCnt,
> computeUnit->getRefCounter(dispatchId, wgId))) {
341c341
< old_barrier_cnt = barrier_cnt;
---
> oldBarrierCnt = barrierCnt;
398c398
< if ((outstanding_reqs + mem_reqs_in_pipe) > 0) {
---
> if ((outstandingReqs + memReqsInPipe) > 0) {
419c419
< if ((outstanding_reqs + mem_reqs_in_pipe) > 0) {
---
> if ((outstandingReqs + memReqsInPipe) > 0) {
447c447
< if ((outstanding_reqs_wr_gm + wr_gm_reqs_in_pipe) > 0) {
---
> if ((outstandingReqsWrGm + wrGmReqsInPipe) > 0) {
455c455
< if ((outstanding_reqs_rd_gm + rd_gm_reqs_in_pipe) > 0)
---
> if ((outstandingReqsRdGm + rdGmReqsInPipe) > 0)
470c470
< isGMReqFIFOWrRdy(rd_gm_reqs_in_pipe + wr_gm_reqs_in_pipe)) {
---
> isGMReqFIFOWrRdy(rdGmReqsInPipe + wrGmReqsInPipe)) {
487c487
< if ((outstanding_reqs_wr_lm + wr_lm_reqs_in_pipe) > 0) {
---
> if ((outstandingReqsWrLm + wrLmReqsInPipe) > 0) {
494c494
< if ((outstanding_reqs_rd_lm + rd_lm_reqs_in_pipe) > 0) {
---
> if ((outstandingReqsRdLm + rdLmReqsInPipe) > 0) {
509c509
< isLMReqFIFOWrRdy(rd_lm_reqs_in_pipe + wr_lm_reqs_in_pipe)) {
---
> isLMReqFIFOWrRdy(rdLmReqsInPipe + wrLmReqsInPipe)) {
526c526
< if ((outstanding_reqs_wr_gm + wr_gm_reqs_in_pipe) > 0) {
---
> if ((outstandingReqsWrGm + wrGmReqsInPipe) > 0) {
533c533
< if ((outstanding_reqs_rd_gm + rd_gm_reqs_in_pipe) > 0) {
---
> if ((outstandingReqsRdGm + rdGmReqsInPipe) > 0) {
549c549
< isGMReqFIFOWrRdy(rd_gm_reqs_in_pipe + wr_gm_reqs_in_pipe)) {
---
> isGMReqFIFOWrRdy(rdGmReqsInPipe + wrGmReqsInPipe)) {
582c582
< isGMReqFIFOWrRdy(rd_gm_reqs_in_pipe + wr_gm_reqs_in_pipe)) {
---
> isGMReqFIFOWrRdy(rdGmReqsInPipe + wrGmReqsInPipe)) {
588c588
< isLMReqFIFOWrRdy(rd_lm_reqs_in_pipe + wr_lm_reqs_in_pipe)) {
---
> isLMReqFIFOWrRdy(rdLmReqsInPipe + wrLmReqsInPipe)) {
639,640c639,640
< mem_reqs_in_pipe++;
< rd_gm_reqs_in_pipe++;
---
> memReqsInPipe++;
> rdGmReqsInPipe++;
654,655c654,655
< mem_reqs_in_pipe++;
< wr_gm_reqs_in_pipe++;
---
> memReqsInPipe++;
> wrGmReqsInPipe++;
668,669c668,669
< mem_reqs_in_pipe++;
< rd_gm_reqs_in_pipe++;
---
> memReqsInPipe++;
> rdGmReqsInPipe++;
675,676c675,676
< mem_reqs_in_pipe++;
< wr_gm_reqs_in_pipe++;
---
> memReqsInPipe++;
> wrGmReqsInPipe++;
682,684c682,684
< mem_reqs_in_pipe++;
< wr_gm_reqs_in_pipe++;
< rd_gm_reqs_in_pipe++;
---
> memReqsInPipe++;
> wrGmReqsInPipe++;
> rdGmReqsInPipe++;
690,691c690,691
< mem_reqs_in_pipe++;
< rd_lm_reqs_in_pipe++;
---
> memReqsInPipe++;
> rdLmReqsInPipe++;
697,698c697,698
< mem_reqs_in_pipe++;
< wr_lm_reqs_in_pipe++;
---
> memReqsInPipe++;
> wrLmReqsInPipe++;
704,706c704,706
< mem_reqs_in_pipe++;
< wr_lm_reqs_in_pipe++;
< rd_lm_reqs_in_pipe++;
---
> memReqsInPipe++;
> wrLmReqsInPipe++;
> rdLmReqsInPipe++;
712,713c712,713
< mem_reqs_in_pipe++;
< rd_gm_reqs_in_pipe++;
---
> memReqsInPipe++;
> rdGmReqsInPipe++;
719,720c719,720
< mem_reqs_in_pipe++;
< wr_gm_reqs_in_pipe++;
---
> memReqsInPipe++;
> wrGmReqsInPipe++;
726,728c726,728
< mem_reqs_in_pipe++;
< wr_gm_reqs_in_pipe++;
< rd_gm_reqs_in_pipe++;
---
> memReqsInPipe++;
> wrGmReqsInPipe++;
> rdGmReqsInPipe++;
868c868
< return bar_cnt[lane] < max_bar_cnt;
---
> return barCnt[lane] < maxBarCnt;