aboutsummaryrefslogtreecommitdiff
path: root/backend/lib/MIR
diff options
context:
space:
mode:
Diffstat (limited to 'backend/lib/MIR')
-rw-r--r--backend/lib/MIR/LLVMConstantSyntax.cpp49
-rw-r--r--backend/lib/MIR/MIParser.cpp18
-rw-r--r--backend/lib/MIR/MIPrinter.cpp1
-rw-r--r--backend/lib/MIR/MIRDataParser.cpp1
-rw-r--r--backend/lib/MIR/MIRDocumentParser.cpp14
-rw-r--r--backend/lib/MIR/MIRDocumentPrinter.cpp9
-rw-r--r--backend/lib/MIR/MIRFunctionParser.cpp8
7 files changed, 28 insertions, 72 deletions
diff --git a/backend/lib/MIR/LLVMConstantSyntax.cpp b/backend/lib/MIR/LLVMConstantSyntax.cpp
index a2025dc..a687f80 100644
--- a/backend/lib/MIR/LLVMConstantSyntax.cpp
+++ b/backend/lib/MIR/LLVMConstantSyntax.cpp
@@ -307,8 +307,8 @@ private:
return (BitWidth % 64U) == 0 || (Words.back() >> (BitWidth % 64U)) == 0;
}
-[[nodiscard]] bool parseLegacyWideFloatHexWords(std::string_view Digits,
- std::vector<std::uint64_t> &Words) {
+[[nodiscard]] bool parseWideFloatHexWords(std::string_view Digits,
+ std::vector<std::uint64_t> &Words) {
if (Digits.empty() || Digits.size() > 32U || !std::ranges::all_of(Digits, isHexDigit))
return false;
Words.assign(2, 0);
@@ -466,8 +466,7 @@ makeSpecialFloatWords(FloatSemantics Semantics, const SpecialFloatLiteral &Liter
setFloatBit(Words, 61);
return Words;
}
- case FloatSemantics::PPCDoubleDouble:
- case FloatSemantics::PPCDoubleDoubleLegacy: {
+ case FloatSemantics::PPCDoubleDouble: {
std::vector<std::uint64_t> HighPart(1, 0);
makeBinarySpecialFloat(HighPart, 64, 11, Literal);
Words[0] = HighPart.front();
@@ -542,9 +541,8 @@ binaryFloatFormat(FloatSemantics Semantics) noexcept {
.StorageBitWidth = 80,
.HasExplicitIntegerBit = true};
case FloatSemantics::PPCDoubleDouble:
- case FloatSemantics::PPCDoubleDoubleLegacy:
- // LLVM parses a decimal PPC double-double through its documented legacy
- // 106-bit format and then materializes the canonical pair of doubles.
+ // Decimal PPC double-double literals use 106 bits of precision and are
+ // materialized as a canonical pair of doubles.
return BinaryFloatFormat{.Precision = 106,
.MinExponent = -969,
.MaxExponent = 1023,
@@ -884,8 +882,7 @@ convertRationalToFloatWords(FloatSemantics Semantics, bool Negative, const BigUn
auto Rounded = roundBinaryRational(*Format, Numerator, Denominator, BinaryScale);
if (!Rounded)
return std::unexpected(Rounded.error());
- if (Semantics == FloatSemantics::PPCDoubleDouble ||
- Semantics == FloatSemantics::PPCDoubleDoubleLegacy) {
+ if (Semantics == FloatSemantics::PPCDoubleDouble) {
return packPPCDoubleDouble(*Rounded, Negative);
}
if (Format->HasExplicitIntegerBit)
@@ -1806,19 +1803,16 @@ Expected<GenericConstantData> ConstantParser::parseFloatingValue(GenericConstant
ExpectedPrefix = 'L';
break;
case FloatSemantics::PPCDoubleDouble:
- case FloatSemantics::PPCDoubleDoubleLegacy:
ExpectedPrefix = 'M';
break;
default:
break;
}
if (ExpectedPrefix != '\0') {
- const bool IsLegacyWideFormat =
- EffectiveType.Semantics == FloatSemantics::IEEEQuad ||
- EffectiveType.Semantics == FloatSemantics::PPCDoubleDouble ||
- EffectiveType.Semantics == FloatSemantics::PPCDoubleDoubleLegacy;
- const bool Parsed = IsLegacyWideFormat ? parseLegacyWideFloatHexWords(Digits, Words)
- : parseHexWords(Digits, BitWidth, Words);
+ const bool HasWideHexWords = EffectiveType.Semantics == FloatSemantics::IEEEQuad ||
+ EffectiveType.Semantics == FloatSemantics::PPCDoubleDouble;
+ const bool Parsed = HasWideHexWords ? parseWideFloatHexWords(Digits, Words)
+ : parseHexWords(Digits, BitWidth, Words);
if (Prefix != ExpectedPrefix || !Parsed) {
return fail<GenericConstantData>(
"floating-point hexadecimal prefix does not match its type");
@@ -2378,7 +2372,6 @@ Expected<std::string> printType(const GenericConstantType &Type) {
case FloatSemantics::IEEEQuad:
return std::string("fp128");
case FloatSemantics::PPCDoubleDouble:
- case FloatSemantics::PPCDoubleDoubleLegacy:
return std::string("ppc_fp128");
case FloatSemantics::X87DoubleExtended:
return std::string("x86_fp80");
@@ -2481,8 +2474,7 @@ struct PrintedBinaryFloat final {
if (!Format)
return std::nullopt;
- if (Bits.semantics() == FloatSemantics::PPCDoubleDouble ||
- Bits.semantics() == FloatSemantics::PPCDoubleDoubleLegacy) {
+ if (Bits.semantics() == FloatSemantics::PPCDoubleDouble) {
if (Words.size() != 2 || Words[1] != 0)
return std::nullopt;
Format = binaryFloatFormat(FloatSemantics::IEEEDouble);
@@ -2942,7 +2934,6 @@ private:
std::uint64_t StoreSize) const noexcept;
bool Explicit = false;
- std::uint32_t LegacyPointerSizeInBits = 0;
std::vector<LayoutAlignmentEntry> Alignments;
std::vector<LayoutPointerEntry> Pointers;
LayoutAlignment Aggregate{1, 8};
@@ -3010,7 +3001,6 @@ void DataLayoutInfo::setPointer(LayoutPointerEntry Entry) {
Expected<DataLayoutInfo> DataLayoutInfo::parse(LLVMConstantSyntaxOptions Options) {
DataLayoutInfo Result;
- Result.LegacyPointerSizeInBits = Options.DefaultPointerSizeInBits;
if (Options.DataLayout.empty())
return Result;
if (Options.DataLayout.size() > Options.MaximumTokenLength) {
@@ -3322,21 +3312,8 @@ LayoutAlignment DataLayoutInfo::vector(std::uint32_t BitWidth,
Expected<LayoutPointerEntry> DataLayoutInfo::pointer(std::uint32_t AddressSpace) const {
if (!Explicit) {
- if (LegacyPointerSizeInBits == 0) {
- return makeUnexpected(ErrorCode::InvalidArgument,
- "pointer size is required to lay out pointer constants");
- }
- const std::uint64_t Bytes = (static_cast<std::uint64_t>(LegacyPointerSizeInBits) + 7U) / 8U;
- return LayoutPointerEntry{
- .AddressSpace = AddressSpace,
- .SizeInBits = LegacyPointerSizeInBits,
- .IndexSizeInBits = LegacyPointerSizeInBits,
- .Alignment = natural(Bytes),
- .HasExternalState = false,
- .HasUnstableRepresentation = false,
- .NullIsAllOnes = false,
- .AddressSpaceName = {},
- };
+ return makeUnexpected(ErrorCode::InvalidArgument,
+ "pointer size is required to lay out pointer constants");
}
auto Entry = std::ranges::find_if(Pointers, [AddressSpace](const LayoutPointerEntry &Candidate) {
return Candidate.AddressSpace == AddressSpace;
diff --git a/backend/lib/MIR/MIParser.cpp b/backend/lib/MIR/MIParser.cpp
index f634119..3748187 100644
--- a/backend/lib/MIR/MIParser.cpp
+++ b/backend/lib/MIR/MIParser.cpp
@@ -621,16 +621,12 @@ bool MIParser::Impl::parseScalarLowLevelType(const MIToken &TypeToken, LLT &Resu
Created = LLT::makeFloat(FloatSemantics::BFloat);
break;
case ScalarKind::Pointer:
- if (Context.PointerSizeInBits) {
- auto PointerSize = Context.PointerSizeInBits(static_cast<std::uint32_t>(Value));
- if (!PointerSize)
- return importError(TypeToken, PointerSize.error());
- Created = LLT::makePointer(Value, *PointerSize);
- break;
- }
- if (Context.DefaultPointerSizeInBits == 0)
+ if (!Context.PointerSizeInBits)
return fail(TypeToken, "pointer low-level type requires an explicit pointer size");
- Created = LLT::makePointer(Value, Context.DefaultPointerSizeInBits);
+ if (auto PointerSize = Context.PointerSizeInBits(static_cast<std::uint32_t>(Value)))
+ Created = LLT::makePointer(Value, *PointerSize);
+ else
+ return importError(TypeToken, PointerSize.error());
break;
}
if (!Created)
@@ -1722,9 +1718,7 @@ bool MIParser::Impl::parseMemoryBase(MemoryBase &Result, std::int64_t &Offset) {
advance();
break;
case MITokenKind::QuotedIRValue: {
- LLVMConstantSyntaxOptions ConstantOptions;
- ConstantOptions.DefaultPointerSizeInBits = Context.DefaultPointerSizeInBits;
- auto Constant = parseLLVMConstant(BaseToken.stringValue(), ConstantOptions);
+ auto Constant = parseLLVMConstant(BaseToken.stringValue());
if (!Constant)
return importError(BaseToken, Constant.error());
auto Base = MemoryBase::irConstant(std::move(*Constant));
diff --git a/backend/lib/MIR/MIPrinter.cpp b/backend/lib/MIR/MIPrinter.cpp
index 25a7a0c..6f88414 100644
--- a/backend/lib/MIR/MIPrinter.cpp
+++ b/backend/lib/MIR/MIPrinter.cpp
@@ -211,7 +211,6 @@ namespace {
case FloatSemantics::IEEEQuad:
return "f128";
case FloatSemantics::PPCDoubleDouble:
- case FloatSemantics::PPCDoubleDoubleLegacy:
case FloatSemantics::Float8E5M2:
case FloatSemantics::Float8E5M2FNUZ:
case FloatSemantics::Float8E4M3:
diff --git a/backend/lib/MIR/MIRDataParser.cpp b/backend/lib/MIR/MIRDataParser.cpp
index 7e04ace..2ac1f2d 100644
--- a/backend/lib/MIR/MIRDataParser.cpp
+++ b/backend/lib/MIR/MIRDataParser.cpp
@@ -129,7 +129,6 @@ bool MIRDocumentParser::parseConstants(const yaml::Node &Root, MachineFunction &
if (scalar(*ValueNode, ValueText, "LLVM constant"))
return true;
const LLVMConstantSyntaxOptions ConstantOptions{
- .DefaultPointerSizeInBits = Context.DefaultPointerSizeInBits,
.DataLayout = DataLayout,
.NamedTypes = NamedTypes,
};
diff --git a/backend/lib/MIR/MIRDocumentParser.cpp b/backend/lib/MIR/MIRDocumentParser.cpp
index 9c4728a..08627d5 100644
--- a/backend/lib/MIR/MIRDocumentParser.cpp
+++ b/backend/lib/MIR/MIRDocumentParser.cpp
@@ -72,18 +72,19 @@ const yaml::Node *MIRDocumentParser::mappingValue(const yaml::Node &Mapping,
}
std::string_view MIRDocumentParser::effectiveDataLayout() const noexcept {
+ if (!Options.DataLayout.empty())
+ return Options.DataLayout;
if (ActiveDocument != nullptr) {
if (const EmbeddedIRReferenceIndex *Embedded = ActiveDocument->embeddedIR()) {
if (const auto DataLayout = Embedded->dataLayout())
return *DataLayout;
}
}
- return Options.DataLayout;
+ return {};
}
LLVMConstantSyntaxOptions MIRDocumentParser::pointerLayoutOptions() const noexcept {
return {
- .DefaultPointerSizeInBits = Options.DefaultPointerSizeInBits,
.DataLayout = effectiveDataLayout(),
.NamedTypes = {},
};
@@ -243,14 +244,6 @@ MIRDocumentParseResult MIRDocumentParser::run() {
FirstFunction = FirstContent + 1;
}
- if (const EmbeddedIRReferenceIndex *Embedded = Staging.embeddedIR()) {
- if (const auto DataLayout = Embedded->dataLayout();
- DataLayout && !Options.DataLayout.empty() && *DataLayout != Options.DataLayout) {
- static_cast<void>(fail(Stream->documents()[FirstContent].Range,
- "explicit DataLayout does not match embedded LLVM IR data layout"));
- return std::move(Result);
- }
- }
if (!effectiveDataLayout().empty()) {
auto PointerSize = llvmPointerSizeInBits(0, pointerLayoutOptions());
if (!PointerSize) {
@@ -374,7 +367,6 @@ bool MIRDocumentParser::parseFunction(const yaml::Node &Root, MIRDocument &Docum
.HasFakeUses = std::nullopt,
};
MIParserContext Context;
- Context.DefaultPointerSizeInBits = Options.DefaultPointerSizeInBits;
if (IRFunction != nullptr) {
Context.HasIRBlock = [IRFunction](std::string_view BlockName) {
return IRFunction->block(BlockName) != nullptr;
diff --git a/backend/lib/MIR/MIRDocumentPrinter.cpp b/backend/lib/MIR/MIRDocumentPrinter.cpp
index 5cc0173..06998bb 100644
--- a/backend/lib/MIR/MIRDocumentPrinter.cpp
+++ b/backend/lib/MIR/MIRDocumentPrinter.cpp
@@ -387,9 +387,6 @@ MIRDocumentPrinter::verifyOmittedEmbeddedIRLayout(const MachineFunction &Functio
const EmbeddedIRReferenceIndex *Embedded = Document.embeddedIR();
if (Embedded == nullptr)
return {};
- const auto EmbeddedDataLayout = Embedded->dataLayout();
- if (!EmbeddedDataLayout)
- return {};
bool HasLayoutDependentContent = false;
for (const VirtualRegisterInfo &RegisterInfo : Function.registerInfo().virtualRegisters()) {
@@ -412,14 +409,14 @@ MIRDocumentPrinter::verifyOmittedEmbeddedIRLayout(const MachineFunction &Functio
if (!HasLayoutDependentContent)
return {};
- if (Options.DataLayout != *EmbeddedDataLayout) {
+ if (Options.DataLayout.empty()) {
return makeUnexpected(
ErrorCode::InvalidArgument,
- "omitting embedded LLVM IR requires printer DataLayout to exactly match its data layout");
+ "omitting embedded LLVM IR with layout-dependent MIR requires an explicit printer "
+ "DataLayout");
}
const LLVMConstantSyntaxOptions LayoutOptions{
- .DefaultPointerSizeInBits = Options.DefaultPointerSizeInBits,
.DataLayout = Options.DataLayout,
.NamedTypes = {},
};
diff --git a/backend/lib/MIR/MIRFunctionParser.cpp b/backend/lib/MIR/MIRFunctionParser.cpp
index 7e8821b..8cf3abb 100644
--- a/backend/lib/MIR/MIRFunctionParser.cpp
+++ b/backend/lib/MIR/MIRFunctionParser.cpp
@@ -411,12 +411,12 @@ TextRange MIRDocumentParser::scalarDiagnosticRange(const yaml::Node &Scalar,
if (!FoundContent)
return Scalar.range();
- const TextPosition Fallback = Scalar.range().Begin;
+ const TextPosition DefaultPosition = Scalar.range().Begin;
const auto MapPosition = [this, FirstBodyLine, LastBodyLine, Indent,
- Fallback](TextPosition Position) {
+ DefaultPosition](TextPosition Position) {
const std::size_t SourceLine = FirstBodyLine + Position.Line - 1U;
if (Position.Line == 0 || SourceLine > LastBodyLine || SourceLine > Result.Source.lineCount()) {
- return Fallback;
+ return DefaultPosition;
}
const std::string_view SourceLineText = Result.Source.line(SourceLine);
const std::size_t BodyColumn = Position.Column == 0 ? 0 : Position.Column - 1U;
@@ -440,8 +440,6 @@ bool MIRDocumentParser::parseBody(const yaml::Node &Root, MachineFunction &Funct
BodyRange = Body->range();
}
- if (Options.DefaultPointerSizeInBits != 0)
- Context.DefaultPointerSizeInBits = Options.DefaultPointerSizeInBits;
if (!effectiveDataLayout().empty()) {
const LLVMConstantSyntaxOptions PointerOptions = pointerLayoutOptions();
Context.PointerSizeInBits = [PointerOptions](std::uint32_t AddressSpace) {
generated by cgit v1.2.3 (git 2.46.0) at 2026-10-29 06:38:59 +0000