158c158
< uint64_t base_ptr;
---
> uint64_t basePtr;
160,163c160,163
< uint32_t old_barrier_cnt;
< uint32_t barrier_cnt;
< uint32_t barrier_id;
< uint32_t barrier_slots;
---
> uint32_t oldBarrierCnt;
> uint32_t barrierCnt;
> uint32_t barrierId;
> uint32_t barrierSlots;
167c167
< int kern_id;
---
> int kernId;
196,206c196,206
< std::vector<Addr> last_addr;
< std::vector<uint32_t> workitemid[3];
< std::vector<uint32_t> workitemFlatId;
< uint32_t workgroupid[3];
< uint32_t workgroupsz[3];
< uint32_t gridsz[3];
< uint32_t wg_id;
< uint32_t wg_sz;
< uint32_t dynwaveid;
< uint32_t maxdynwaveid;
< uint32_t dispatchid;
---
> std::vector<Addr> lastAddr;
> std::vector<uint32_t> workItemId[3];
> std::vector<uint32_t> workItemFlatId;
> uint32_t workGroupId[3];
> uint32_t workGroupSz[3];
> uint32_t gridSz[3];
> uint32_t wgId;
> uint32_t wgSz;
> uint32_t dynWaveId;
> uint32_t maxDynWaveId;
> uint32_t dispatchId;
208c208
< uint32_t outstanding_reqs;
---
> uint32_t outstandingReqs;
211c211
< uint32_t mem_reqs_in_pipe;
---
> uint32_t memReqsInPipe;
213c213
< uint32_t outstanding_reqs_wr_gm;
---
> uint32_t outstandingReqsWrGm;
215c215
< uint32_t outstanding_reqs_wr_lm;
---
> uint32_t outstandingReqsWrLm;
217c217
< uint32_t outstanding_reqs_rd_gm;
---
> uint32_t outstandingReqsRdGm;
219,223c219,223
< uint32_t outstanding_reqs_rd_lm;
< uint32_t rd_lm_reqs_in_pipe;
< uint32_t rd_gm_reqs_in_pipe;
< uint32_t wr_lm_reqs_in_pipe;
< uint32_t wr_gm_reqs_in_pipe;
---
> uint32_t outstandingReqsRdLm;
> uint32_t rdLmReqsInPipe;
> uint32_t rdGmReqsInPipe;
> uint32_t wrLmReqsInPipe;
> uint32_t wrGmReqsInPipe;
225,226c225,226
< int mem_trace_busy;
< uint64_t last_trace;
---
> int memTraceBusy;
> uint64_t lastTrace;
234c234
< std::vector<uint32_t> old_vgpr;
---
> std::vector<uint32_t> oldVgpr;
236c236
< uint32_t old_vgpr_id;
---
> uint32_t oldVgprId;
238c238
< uint64_t old_vgpr_tcnt;
---
> uint64_t oldVgprTcnt;
241c241
< std::vector<uint64_t> old_dgpr;
---
> std::vector<uint64_t> oldDgpr;
243c243
< uint32_t old_dgpr_id;
---
> uint32_t oldDgprId;
245c245
< uint64_t old_dgpr_tcnt;
---
> uint64_t oldDgprTcnt;
248c248
< VectorMask init_mask;
---
> VectorMask initMask;
251,252c251,252
< std::vector<int> bar_cnt;
< int max_bar_cnt;
---
> std::vector<int> barCnt;
> int maxBarCnt;
336c336
< VectorMask get_pred() { return execMask() & init_mask; }
---
> VectorMask getPred() { return execMask() & initMask; }