This is an archive of the discontinued LLVM Phabricator instance.

Differential D73091

[llvm-as] Fix assembling of index with multiple summaries sharing the same GUID
ClosedPublic

Authored by evgeny777 on Jan 21 2020, 3:17 AM.

Details

Reviewers
tejohnson
Commits
rG3593b5b3e9ce: [llvm-as] Fix assembling of index with multiple summaries sharing single GUID
Summary

Currently llvm-as fails with error expected ')' here

Diff Detail

Event Timeline

evgeny777 created this revision.Jan 21 2020, 3:17 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 21 2020, 3:17 AM
Herald added subscribers: arphaman, dexonsmith, steven_wu and 2 others. · View Herald Transcript
evgeny777 added a child revision: D73094: [WPD] Allow load/save bitcoded index when running opt -wholeprogramdevirt.Jan 21 2020, 3:46 AM
tejohnson accepted this revision.Jan 21 2020, 8:40 AM

lgtm

Looks like parsing of combined index assembly not well tested since no testing was relying on that functionality.

This revision is now accepted and ready to land.Jan 21 2020, 8:40 AM
Closed by commit rG3593b5b3e9ce: [llvm-as] Fix assembling of index with multiple summaries sharing single GUID (authored by Evgeny Leviant <evgeny@Evgenys-iMac.local>). · Explain WhyJan 22 2020, 1:13 AM
This revision was automatically updated to reflect the committed changes.
thakis added a subscriber: thakis.Jan 22 2020, 4:42 AM

Looks like this breaks tests on Windows: http://45.33.8.238/win/6326/step_11.txt

Revision Contents

PathSize
llvm/
lib/
AsmParser/
11 lines
test/
Assembler/
12 lines

Diff 239268

llvm/lib/AsmParser/LLParser.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 8,033 Lines • ▼ Show 20 Lines if (!EatIfPresent(lltok::comma)) {
// the symbol must have external linkage. // the symbol must have external linkage.
AddGlobalValueToIndex(Name, GUID, GlobalValue::ExternalLinkage, ID, AddGlobalValueToIndex(Name, GUID, GlobalValue::ExternalLinkage, ID,
nullptr); nullptr);
return false; return false;
} }
// Have a list of summaries // Have a list of summaries
if (ParseToken(lltok::kw_summaries, "expected 'summaries' here") || if (ParseToken(lltok::kw_summaries, "expected 'summaries' here") ||
ParseToken(lltok::colon, "expected ':' here")) ParseToken(lltok::colon, "expected ':' here") ||
ParseToken(lltok::lparen, "expected '(' here"))
return true; return true;
do { do {
if (ParseToken(lltok::lparen, "expected '(' here"))
return true;
switch (Lex.getKind()) { switch (Lex.getKind()) {
case lltok::kw_function: case lltok::kw_function:
if (ParseFunctionSummary(Name, GUID, ID)) if (ParseFunctionSummary(Name, GUID, ID))
return true; return true;
break; break;
case lltok::kw_variable: case lltok::kw_variable:
if (ParseVariableSummary(Name, GUID, ID)) if (ParseVariableSummary(Name, GUID, ID))
return true; return true;
break; break;
case lltok::kw_alias: case lltok::kw_alias:
if (ParseAliasSummary(Name, GUID, ID)) if (ParseAliasSummary(Name, GUID, ID))
return true; return true;
break; break;
default: default:
return Error(Lex.getLoc(), "expected summary type"); return Error(Lex.getLoc(), "expected summary type");
} }
if (ParseToken(lltok::rparen, "expected ')' here"))
return true;
} while (EatIfPresent(lltok::comma)); } while (EatIfPresent(lltok::comma));
if (ParseToken(lltok::rparen, "expected ')' here")) if (ParseToken(lltok::rparen, "expected ')' here") ||
ParseToken(lltok::rparen, "expected ')' here"))
return true; return true;
return false; return false;
} }
/// FunctionSummary /// FunctionSummary
/// ::= 'function' ':' '(' 'module' ':' ModuleReference ',' GVFlags /// ::= 'function' ':' '(' 'module' ':' ModuleReference ',' GVFlags
/// ',' 'insts' ':' UInt32 [',' OptionalFFlags]? [',' OptionalCalls]? /// ',' 'insts' ':' UInt32 [',' OptionalFFlags]? [',' OptionalCalls]?
▲ Show 20 Lines • Show All 837 Lines • Show Last 20 Lines

llvm/test/Assembler/thinlto-multiple-summaries-for-guid.ll

  • This file was added.
; Checks that llvm-as/llvm-dis correctly assembles/disassembles index with
; multiple summaries with single GUID.
; RUN: llvm-as %s -o - | llvm-dis -o - | FileCheck %s
source_filename = "index.bc"
^0 = module: (path: "main.bc", hash: (3499594384, 1671013073, 3271036935, 1830411232, 59290952))
; CHECK: ^0 = module: (path: "main.bc", hash: (3499594384, 1671013073, 3271036935, 1830411232, 59290952))
^1 = module: (path: "[Regular LTO]", hash: (0, 0, 0, 0, 0))
; CHECK-NEXT: ^1 = module: (path: "[Regular LTO]", hash: (0, 0, 0, 0, 0))
^2 = gv: (guid: 13351721993301222997, summaries: (function: (module: ^0, flags: (linkage: linkonce_odr, notEligibleToImport: 0, live: 1, dsoLocal: 1, canAutoHide: 1), insts: 1), function: (module: ^1, flags: (linkage: available_externally, notEligibleToImport: 1, live: 1, dsoLocal: 1, canAutoHide: 0), insts: 1)))
; CHECK-NEXT: ^2 = gv: (guid: 13351721993301222997, summaries: (function: (module: ^0, flags: (linkage: linkonce_odr, notEligibleToImport: 0, live: 1, dsoLocal: 1, canAutoHide: 1), insts: 1), function: (module: ^1, flags: (linkage: available_externally, notEligibleToImport: 1, live: 1, dsoLocal: 1, canAutoHide: 0), insts: 1)))