BCR revert 204888

BCR revert 204888
This commit is contained in:
Cheng, Bu Qi
2025-07-27 06:51:40 +00:00
committed by igcbot
parent 964f83bf0c
commit 4fc519a9d1

View File

@ -846,12 +846,10 @@ void BankConflictPass::setupBankConflictsforMad(G4_INST *inst) {
G4_Declare *dcls[3];
G4_Declare *opndDcls[3];
BankConflict assignedBank = BANK_CONFLICT_NONE; // Flip for next
bool fixedBank[3];
for (int i = 0; i < 3; i += 1) {
dcls[i] = nullptr;
opndDcls[i] = nullptr;
fixedBank[i] = false;
G4_Operand *src = inst->getSrc(i);
if (!src || !src->isSrcRegRegion() || src->isAreg()) {
@ -865,15 +863,6 @@ void BankConflictPass::setupBankConflictsforMad(G4_INST *inst) {
gra.kernel.numEltPerGRF<Type_UB>();
srcBC[i] = gra.getBankConflict(dcls[i]);
if (dcls[i]->getRegVar() &&
dcls[i]->getRegVar()->isPhyRegAssigned()) {
int regNum = dcls[i]->getRegVar()->getPhyReg()->asGreg()->getRegNum();
srcBC[i] = regNum % 2 ? BANK_CONFLICT_SECOND_HALF_ODD
: BANK_CONFLICT_FIRST_HALF_EVEN;
gra.setBankConflict(dcls[i], srcBC[i]);
fixedBank[i] = true;
}
if (srcBC[i] != BANK_CONFLICT_NONE) {
if (isOddOffset(offset[i])) {
if (srcBC[i] == BANK_CONFLICT_FIRST_HALF_EVEN) {
@ -927,7 +916,7 @@ void BankConflictPass::setupBankConflictsforMad(G4_INST *inst) {
}
srcBC[i] = gra.getBankConflict(dcls[i]);
if (!fixedBank[i] && srcBC[i] != BANK_CONFLICT_NONE) {
if (srcBC[i] != BANK_CONFLICT_NONE) {
if (isOddOffset(offset[i])) {
if (srcBC[i] == BANK_CONFLICT_FIRST_HALF_EVEN) {
srcBC[i] = BANK_CONFLICT_SECOND_HALF_ODD;
@ -954,7 +943,7 @@ void BankConflictPass::setupBankConflictsforMad(G4_INST *inst) {
: BANK_CONFLICT_FIRST_HALF_EVEN;
}
gra.setBankConflict(dcls[i], srcBC[i]);
} else if (!fixedBank[i]) {
} else {
srcBC[i] = (assignedBank == BANK_CONFLICT_FIRST_HALF_EVEN)
? BANK_CONFLICT_SECOND_HALF_ODD
: BANK_CONFLICT_FIRST_HALF_EVEN;