62c62
< const VectorMask &mask = w->get_pred();
---
> const VectorMask &mask = w->getPred();
162c162
< const VectorMask &mask = w->get_pred();
---
> const VectorMask &mask = w->getPred();
233c233
< m->kern_id = w->kern_id;
---
> m->kern_id = w->kernId;
264,265c264,265
< w->outstanding_reqs_rd_gm++;
< w->rd_gm_reqs_in_pipe--;
---
> w->outstandingReqsRdGm++;
> w->rdGmReqsInPipe--;
284c284
< w->last_addr[lane] = m->addr[lane];
---
> w->lastAddr[lane] = m->addr[lane];
290,291c290,291
< w->outstanding_reqs_rd_gm++;
< w->rd_gm_reqs_in_pipe--;
---
> w->outstandingReqsRdGm++;
> w->rdGmReqsInPipe--;
299,300c299,300
< w->outstanding_reqs_rd_lm++;
< w->rd_lm_reqs_in_pipe--;
---
> w->outstandingReqsRdLm++;
> w->rdLmReqsInPipe--;
316,317c316,317
< w->outstanding_reqs_rd_gm++;
< w->rd_gm_reqs_in_pipe--;
---
> w->outstandingReqsRdGm++;
> w->rdGmReqsInPipe--;
335,336c335,336
< w->outstanding_reqs_rd_gm++;
< w->rd_gm_reqs_in_pipe--;
---
> w->outstandingReqsRdGm++;
> w->rdGmReqsInPipe--;
344,345c344,345
< w->outstanding_reqs++;
< w->mem_reqs_in_pipe--;
---
> w->outstandingReqs++;
> w->memReqsInPipe--;
358c358
< const VectorMask &mask = w->get_pred();
---
> const VectorMask &mask = w->getPred();
422c422
< m->kern_id = w->kern_id;
---
> m->kern_id = w->kernId;
451,452c451,452
< w->outstanding_reqs_wr_gm++;
< w->wr_gm_reqs_in_pipe--;
---
> w->outstandingReqsWrGm++;
> w->wrGmReqsInPipe--;
472,473c472,473
< w->outstanding_reqs_wr_gm++;
< w->wr_gm_reqs_in_pipe--;
---
> w->outstandingReqsWrGm++;
> w->wrGmReqsInPipe--;
481,482c481,482
< w->outstanding_reqs_wr_lm++;
< w->wr_lm_reqs_in_pipe--;
---
> w->outstandingReqsWrLm++;
> w->wrLmReqsInPipe--;
500,501c500,501
< w->outstanding_reqs_wr_gm++;
< w->wr_gm_reqs_in_pipe--;
---
> w->outstandingReqsWrGm++;
> w->wrGmReqsInPipe--;
508,509c508,509
< w->outstanding_reqs++;
< w->mem_reqs_in_pipe--;
---
> w->outstandingReqs++;
> w->memReqsInPipe--;
599c599
< m->kern_id = w->kern_id;
---
> m->kern_id = w->kernId;
610,613c610,613
< w->outstanding_reqs_wr_gm++;
< w->wr_gm_reqs_in_pipe--;
< w->outstanding_reqs_rd_gm++;
< w->rd_gm_reqs_in_pipe--;
---
> w->outstandingReqsWrGm++;
> w->wrGmReqsInPipe--;
> w->outstandingReqsRdGm++;
> w->rdGmReqsInPipe--;
621,624c621,624
< w->outstanding_reqs_wr_lm++;
< w->wr_lm_reqs_in_pipe--;
< w->outstanding_reqs_rd_lm++;
< w->rd_lm_reqs_in_pipe--;
---
> w->outstandingReqsWrLm++;
> w->wrLmReqsInPipe--;
> w->outstandingReqsRdLm++;
> w->rdLmReqsInPipe--;
632,633c632,633
< w->outstanding_reqs++;
< w->mem_reqs_in_pipe--;
---
> w->outstandingReqs++;
> w->memReqsInPipe--;