[llvm] [MC] Optimize loops in MC. (PR #98114)
Dmitriy Chestnykh via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 9 00:47:12 PDT 2024
https://github.com/chestnykh updated https://github.com/llvm/llvm-project/pull/98114
>From 9e3343f8013522e9871279951eb173fed5d73b1d Mon Sep 17 00:00:00 2001
From: Dmitry Chestnykh <dm.chestnykh at gmail.com>
Date: Tue, 9 Jul 2024 08:51:20 +0300
Subject: [PATCH 1/2] [MC,COFF] Don't evaluate `end()` every iteration
In accordance with https://llvm.org/docs/CodingStandards.html
we shouldn't do this.
---
llvm/lib/MC/XCOFFObjectWriter.cpp | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/llvm/lib/MC/XCOFFObjectWriter.cpp b/llvm/lib/MC/XCOFFObjectWriter.cpp
index 03a4ee831d895..c65fc4612137c 100644
--- a/llvm/lib/MC/XCOFFObjectWriter.cpp
+++ b/llvm/lib/MC/XCOFFObjectWriter.cpp
@@ -1385,11 +1385,12 @@ void XCOFFObjectWriter::addExceptionEntry(
unsigned XCOFFObjectWriter::getExceptionSectionSize() {
unsigned EntryNum = 0;
- for (auto it = ExceptionSection.ExceptionTable.begin();
- it != ExceptionSection.ExceptionTable.end(); ++it)
- // The size() gets +1 to account for the initial entry containing the
- // symbol table index.
- EntryNum += it->second.Entries.size() + 1;
+ auto CountEntries =
+ [&](std::pair<const StringRef, ExceptionInfo> &ExceptionTableEntry) {
+ EntryNum += ExceptionTableEntry.second.Entries.size() + 1;
+ };
+
+ for_each(ExceptionSection.ExceptionTable, CountEntries);
return EntryNum * (is64Bit() ? XCOFF::ExceptionSectionEntrySize64
: XCOFF::ExceptionSectionEntrySize32);
@@ -1397,11 +1398,10 @@ unsigned XCOFFObjectWriter::getExceptionSectionSize() {
unsigned XCOFFObjectWriter::getExceptionOffset(const MCSymbol *Symbol) {
unsigned EntryNum = 0;
- for (auto it = ExceptionSection.ExceptionTable.begin();
- it != ExceptionSection.ExceptionTable.end(); ++it) {
- if (Symbol == it->second.FunctionSymbol)
+ for (const auto &TableEntry : ExceptionSection.ExceptionTable) {
+ if (Symbol == TableEntry.second.FunctionSymbol)
break;
- EntryNum += it->second.Entries.size() + 1;
+ EntryNum += TableEntry.second.Entries.size() + 1;
}
return EntryNum * (is64Bit() ? XCOFF::ExceptionSectionEntrySize64
: XCOFF::ExceptionSectionEntrySize32);
@@ -1667,17 +1667,16 @@ void XCOFFObjectWriter::writeSectionForDwarfSectionEntry(
void XCOFFObjectWriter::writeSectionForExceptionSectionEntry(
const MCAssembler &Asm, ExceptionSectionEntry &ExceptionEntry,
uint64_t &CurrentAddressLocation) {
- for (auto it = ExceptionEntry.ExceptionTable.begin();
- it != ExceptionEntry.ExceptionTable.end(); it++) {
+ for (const auto &TableEntry : ExceptionEntry.ExceptionTable) {
// For every symbol that has exception entries, you must start the entries
// with an initial symbol table index entry
- W.write<uint32_t>(SymbolIndexMap[it->second.FunctionSymbol]);
+ W.write<uint32_t>(SymbolIndexMap[TableEntry.second.FunctionSymbol]);
if (is64Bit()) {
// 4-byte padding on 64-bit.
W.OS.write_zeros(4);
}
W.OS.write_zeros(2);
- for (auto &TrapEntry : it->second.Entries) {
+ for (auto &TrapEntry : TableEntry.second.Entries) {
writeWord(TrapEntry.TrapAddress);
W.write<uint8_t>(TrapEntry.Lang);
W.write<uint8_t>(TrapEntry.Reason);
>From 659626a20922351bf64c65c730d6dda867b8ea76 Mon Sep 17 00:00:00 2001
From: Dmitry Chestnykh <dm.chestnykh at gmail.com>
Date: Tue, 9 Jul 2024 08:52:33 +0300
Subject: [PATCH 2/2] [MC,AsmParser] Don't evaluate `end()` every iteration
In accordance with https://llvm.org/docs/CodingStandards.html
we shouldn't do this.
---
llvm/lib/MC/MCParser/AsmParser.cpp | 6 +++---
llvm/lib/MC/MCParser/MasmParser.cpp | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp
index f3caa90eedfb1..dba56b15424d5 100644
--- a/llvm/lib/MC/MCParser/AsmParser.cpp
+++ b/llvm/lib/MC/MCParser/AsmParser.cpp
@@ -6116,8 +6116,8 @@ bool AsmParser::parseMSInlineAsm(
const char *AsmStart = ASMString.begin();
const char *AsmEnd = ASMString.end();
array_pod_sort(AsmStrRewrites.begin(), AsmStrRewrites.end(), rewritesSort);
- for (auto it = AsmStrRewrites.begin(); it != AsmStrRewrites.end(); ++it) {
- const AsmRewrite &AR = *it;
+ for (auto I = AsmStrRewrites.begin(), E = AsmStrRewrites.end(); I != E; ++I) {
+ const AsmRewrite &AR = *I;
// Check if this has already been covered by another rewrite...
if (AR.Done)
continue;
@@ -6160,7 +6160,7 @@ bool AsmParser::parseMSInlineAsm(
SMLoc OffsetLoc = SMLoc::getFromPointer(AR.IntelExp.OffsetName.data());
size_t OffsetLen = OffsetName.size();
auto rewrite_it = std::find_if(
- it, AsmStrRewrites.end(), [&](const AsmRewrite &FusingAR) {
+ I, AsmStrRewrites.end(), [&](const AsmRewrite &FusingAR) {
return FusingAR.Loc == OffsetLoc && FusingAR.Len == OffsetLen &&
(FusingAR.Kind == AOK_Input ||
FusingAR.Kind == AOK_CallInput);
diff --git a/llvm/lib/MC/MCParser/MasmParser.cpp b/llvm/lib/MC/MCParser/MasmParser.cpp
index 653cc64b4c36a..f64b7f62d61d0 100644
--- a/llvm/lib/MC/MCParser/MasmParser.cpp
+++ b/llvm/lib/MC/MCParser/MasmParser.cpp
@@ -7474,8 +7474,8 @@ bool MasmParser::parseMSInlineAsm(
const char *AsmStart = ASMString.begin();
const char *AsmEnd = ASMString.end();
array_pod_sort(AsmStrRewrites.begin(), AsmStrRewrites.end(), rewritesSort);
- for (auto it = AsmStrRewrites.begin(); it != AsmStrRewrites.end(); ++it) {
- const AsmRewrite &AR = *it;
+ for (auto I = AsmStrRewrites.begin(), E = AsmStrRewrites.end(); I != E; ++I) {
+ const AsmRewrite &AR = *I;
// Check if this has already been covered by another rewrite...
if (AR.Done)
continue;
@@ -7518,7 +7518,7 @@ bool MasmParser::parseMSInlineAsm(
SMLoc OffsetLoc = SMLoc::getFromPointer(AR.IntelExp.OffsetName.data());
size_t OffsetLen = OffsetName.size();
auto rewrite_it = std::find_if(
- it, AsmStrRewrites.end(), [&](const AsmRewrite &FusingAR) {
+ I, AsmStrRewrites.end(), [&](const AsmRewrite &FusingAR) {
return FusingAR.Loc == OffsetLoc && FusingAR.Len == OffsetLen &&
(FusingAR.Kind == AOK_Input ||
FusingAR.Kind == AOK_CallInput);
More information about the llvm-commits
mailing list