Index: lib/CodeGen/GlobalISel/CSEInfo.cpp =================================================================== --- lib/CodeGen/GlobalISel/CSEInfo.cpp +++ lib/CodeGen/GlobalISel/CSEInfo.cpp @@ -138,7 +138,7 @@ void *&InsertPos) { handleRecordedInsts(); if (auto *Inst = getNodeIfExists(ID, MBB, InsertPos)) { - LLVM_DEBUG(dbgs() << "CSEInfo: Found Instr " << *Inst->MI << "\n";); + LLVM_DEBUG(dbgs() << "CSEInfo::Found Instr " << *Inst->MI;); return const_cast(Inst->MI); } return nullptr; @@ -157,14 +157,14 @@ void GISelCSEInfo::recordNewInstruction(MachineInstr *MI) { if (shouldCSE(MI->getOpcode())) { TemporaryInsts.insert(MI); - LLVM_DEBUG(dbgs() << "CSEInfo: Recording new MI " << *MI); + LLVM_DEBUG(dbgs() << "CSEInfo::Recording new MI " << *MI); } } void GISelCSEInfo::handleRecordedInst(MachineInstr *MI) { assert(shouldCSE(MI->getOpcode()) && "Invalid instruction for CSE"); auto *UMI = InstrMapping.lookup(MI); - LLVM_DEBUG(dbgs() << "CSEInfo: Handling recorded MI " << *MI); + LLVM_DEBUG(dbgs() << "CSEInfo::Handling recorded MI " << *MI); if (UMI) { // Invalidate this MI. invalidateUniqueMachineInstr(UMI); @@ -230,7 +230,7 @@ } void GISelCSEInfo::releaseMemory() { - // print(); + print(); CSEMap.clear(); InstrMapping.clear(); UniqueInstrAllocator.Reset(); @@ -244,11 +244,11 @@ } void GISelCSEInfo::print() { -#ifndef NDEBUG - for (auto &It : OpcodeHitTable) { - dbgs() << "CSE Count for Opc " << It.first << " : " << It.second << "\n"; - }; -#endif + LLVM_DEBUG(for (auto &It + : OpcodeHitTable) { + dbgs() << "CSEInfo::CSE Hit for Opc " << It.first << " : " << It.second + << "\n"; + };); } /// ----------------------------------------- // ---- Profiling methods for FoldingSetNode --- // Index: lib/CodeGen/GlobalISel/CSEMIRBuilder.cpp =================================================================== --- lib/CodeGen/GlobalISel/CSEMIRBuilder.cpp +++ lib/CodeGen/GlobalISel/CSEMIRBuilder.cpp @@ -39,6 +39,7 @@ MachineInstr *MI = CSEInfo->getMachineInstrIfExists(ID, CurMBB, NodeInsertPos); if (MI) { + CSEInfo->countOpcodeHit(MI->getOpcode()); auto CurrPos = getInsertPt(); if (!dominates(MI, CurrPos)) CurMBB->splice(CurrPos, CurMBB, MI); Index: test/CodeGen/AArch64/GlobalISel/legalize-ext-csedebug-output.mir =================================================================== --- /dev/null +++ test/CodeGen/AArch64/GlobalISel/legalize-ext-csedebug-output.mir @@ -0,0 +1,35 @@ +# RUN: llc -march=aarch64 -run-pass=legalizer %s -o - -enable-cse-in-legalizer=1 -debug-only=cseinfo 2>&1 | FileCheck %s +# Test the -debug-only=cseinfo option here to make sure we're recording new instructions and printing the hit count +# at the end. +# REQUIRES: asserts +--- +name: test_cse_in_legalizer +body: | + bb.0.entry: + ; CHECK: CSEInfo::Add MI: %{{[0-9]+}}:_(s8) = G_TRUNC + ; CHECK: CSEInfo::Add MI: %{{[0-9]+}}:_(s32) = G_ZEXT + ; CHECK: CSEInfo::Add MI: %{{[0-9]+}}:_(s8) = G_TRUNC + ; CHECK: CSEInfo::Add MI: %{{[0-9]+}}:_(s32) = G_ZEXT + ; CHECK: CSEInfo::Recording new MI G_CONSTANT + ; CHECK: CSEInfo::Recording new MI G_CONSTANT + ; CHECK: CSEInfo::Recording new MI G_TRUNC + ; CHECK: CSEInfo::Recording new MI G_TRUNC + ; CHECK: CSEInfo::Recording new MI G_AND + ; CHECK: CSEInfo::Recording new MI G_AND + ; CHECK: CSEInfo::Found Instr %{{[0-9]+}}:_(s32) = G_CONSTANT + ; CHECK: CSEInfo::Found Instr %{{[0-9]+}}:_(s32) = G_TRUNC + ; CHECK: CSEInfo::Found Instr %{{[0-9]+}}:_(s32) = G_AND + ; Note - these will be sensitive the opcode numbers. If + ; frequently modifying generic opcodes, we could just regex + ; the opcodes in the following lines instead of checking for + ; specific opcode numbers. + ; CHECK: CSEInfo::CSE Hit for Opc 82 : 1 + ; CHECK: CSEInfo::CSE Hit for Opc 41 : 1 + ; CHECK: CSEInfo::CSE Hit for Opc 83 : 1 + %0:_(s64) = COPY $x0 + %1:_(s8) = G_TRUNC %0(s64) + %19:_(s32) = G_ZEXT %1(s8) + $w0 = COPY %19(s32) + %2:_(s8) = G_TRUNC %0(s64) + %20:_(s32) = G_ZEXT %2(s8) + $w0 = COPY %20(s32)