This is an archive of the discontinued LLVM Phabricator instance.

Differential D158440

[DXILBitcodeWriter] Don't create a new abbrev per MDString
ClosedPublic

Authored by bogner on Aug 21 2023, 10:30 AM.

Details

Reviewers
beanz
bob80905
python3kgae
Commits
rG48e0a6f902ee: [DXILBitcodeWriter] Don't create a new abbrev per MDString
Summary

We were running out of abbrevs and crashing if there were more than 20
something strings in metadata, which turned out to be a bug where we
created an abbrev every time we emitted a string rather than just one
for the string table.

Diff Detail

Event Timeline

bogner created this revision.Aug 21 2023, 10:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 21 2023, 10:30 AM
Herald added subscribers: hiraditya, mcrosier. · View Herald Transcript
bogner requested review of this revision.Aug 21 2023, 10:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 21 2023, 10:30 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
beanz accepted this revision.Aug 21 2023, 10:33 AM

Hah... yea, good fix 😄

This revision is now accepted and ready to land.Aug 21 2023, 10:33 AM
Harbormaster completed remote builds in B253885: Diff 552073.Aug 21 2023, 11:14 AM
Closed by commit rG48e0a6f902ee: [DXILBitcodeWriter] Don't create a new abbrev per MDString (authored by bogner). · Explain WhyAug 21 2023, 1:59 PM
This revision was automatically updated to reflect the committed changes.
bogner added a commit: rG48e0a6f902ee: [DXILBitcodeWriter] Don't create a new abbrev per MDString.

Revision Contents

PathSize
llvm/
lib/
Target/
DirectX/
DXILWriter/
8 lines
test/
tools/
dxil-dis/
74 lines

Diff 552126

llvm/lib/Target/DirectX/DXILWriter/DXILBitcodeWriter.cpp

Show First 20 Lines • Show All 1,760 Lines • ▼ Show 20 Linesunsigned DXILBitcodeWriter::createMetadataStringsAbbrev() {
Abbv->Add(BitCodeAbbrevOp(bitc::METADATA_STRING_OLD)); Abbv->Add(BitCodeAbbrevOp(bitc::METADATA_STRING_OLD));
Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Array)); Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Array));
Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 8)); Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 8));
return Stream.EmitAbbrev(std::move(Abbv)); return Stream.EmitAbbrev(std::move(Abbv));
} }
void DXILBitcodeWriter::writeMetadataStrings( void DXILBitcodeWriter::writeMetadataStrings(
ArrayRef<const Metadata *> Strings, SmallVectorImpl<uint64_t> &Record) { ArrayRef<const Metadata *> Strings, SmallVectorImpl<uint64_t> &Record) {
if (Strings.empty())
return;
unsigned MDSAbbrev = createMetadataStringsAbbrev();
for (const Metadata *MD : Strings) { for (const Metadata *MD : Strings) {
const MDString *MDS = cast<MDString>(MD); const MDString *MDS = cast<MDString>(MD);
// Code: [strchar x N] // Code: [strchar x N]
Record.append(MDS->bytes_begin(), MDS->bytes_end()); Record.append(MDS->bytes_begin(), MDS->bytes_end());
// Emit the finished record. // Emit the finished record.
Stream.EmitRecord(bitc::METADATA_STRING_OLD, Record, Stream.EmitRecord(bitc::METADATA_STRING_OLD, Record, MDSAbbrev);
createMetadataStringsAbbrev());
Record.clear(); Record.clear();
} }
} }
void DXILBitcodeWriter::writeModuleMetadata() { void DXILBitcodeWriter::writeModuleMetadata() {
if (!VE.hasMDs() && M.named_metadata_empty()) if (!VE.hasMDs() && M.named_metadata_empty())
return; return;
▲ Show 20 Lines • Show All 1,132 Lines • Show Last 20 Lines

llvm/test/tools/dxil-dis/md-manystrings.ll

  • This file was added.
; RUN: llc --filetype=obj %s -o - | dxil-dis | FileCheck %s
; Make sure that DXILBitcodeWriter can handle more than 20 or so strings
; without crashing.
target triple = "dxil-unknown-shadermodel6.7-library"
!llvm.too_many_strings = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9, !10, !11, !12, !13, !14, !15, !16, !17, !18, !19, !20, !21, !22, !23, !24, !25, !26, !27, !28, !29, !30, !31}
!0 = !{!"String 0"}
!1 = !{!"String 1"}
!2 = !{!"String 2"}
!3 = !{!"String 3"}
!4 = !{!"String 4"}
!5 = !{!"String 5"}
!6 = !{!"String 6"}
!7 = !{!"String 7"}
!8 = !{!"String 8"}
!9 = !{!"String 9"}
!10 = !{!"String 10"}
!11 = !{!"String 11"}
!12 = !{!"String 12"}
!13 = !{!"String 13"}
!14 = !{!"String 14"}
!15 = !{!"String 15"}
!16 = !{!"String 16"}
!17 = !{!"String 17"}
!18 = !{!"String 18"}
!19 = !{!"String 19"}
!20 = !{!"String 20"}
!21 = !{!"String 21"}
!22 = !{!"String 22"}
!23 = !{!"String 23"}
!24 = !{!"String 24"}
!25 = !{!"String 25"}
!26 = !{!"String 26"}
!27 = !{!"String 27"}
!28 = !{!"String 28"}
!29 = !{!"String 29"}
!30 = !{!"String 30"}
!31 = !{!"String 31"}
; CHECK: !llvm.too_many_strings = !{!0, !1, !2, !3, !4, !5, !6, !7, !8, !9, !10, !11, !12, !13, !14, !15, !16, !17, !18, !19, !20, !21, !22, !23, !24, !25, !26, !27, !28, !29, !30, !31}
; CHECK: !0 = !{!"String 0"}
; CHECK: !1 = !{!"String 1"}
; CHECK: !2 = !{!"String 2"}
; CHECK: !3 = !{!"String 3"}
; CHECK: !4 = !{!"String 4"}
; CHECK: !5 = !{!"String 5"}
; CHECK: !6 = !{!"String 6"}
; CHECK: !7 = !{!"String 7"}
; CHECK: !8 = !{!"String 8"}
; CHECK: !9 = !{!"String 9"}
; CHECK: !10 = !{!"String 10"}
; CHECK: !11 = !{!"String 11"}
; CHECK: !12 = !{!"String 12"}
; CHECK: !13 = !{!"String 13"}
; CHECK: !14 = !{!"String 14"}
; CHECK: !15 = !{!"String 15"}
; CHECK: !16 = !{!"String 16"}
; CHECK: !17 = !{!"String 17"}
; CHECK: !18 = !{!"String 18"}
; CHECK: !19 = !{!"String 19"}
; CHECK: !20 = !{!"String 20"}
; CHECK: !21 = !{!"String 21"}
; CHECK: !22 = !{!"String 22"}
; CHECK: !23 = !{!"String 23"}
; CHECK: !24 = !{!"String 24"}
; CHECK: !25 = !{!"String 25"}
; CHECK: !26 = !{!"String 26"}
; CHECK: !27 = !{!"String 27"}
; CHECK: !28 = !{!"String 28"}
; CHECK: !29 = !{!"String 29"}
; CHECK: !30 = !{!"String 30"}
; CHECK: !31 = !{!"String 31"}