This is an archive of the discontinued LLVM Phabricator instance.

Differential D110223

[mlir] Fix build on Windows on Arm
ClosedPublic

Authored by rovka on Sep 22 2021, 12:23 AM.

Details

Reviewers
mehdi_amini
rriddle
jpienaar
Commits
rGb7050c791d89: [mlir] Fix build on Windows on Arm
Summary

clang-cl errors out while handling the templated version of tgfmt. This
patch works around the issue by explicitly choosing the non-templated
version of tgfmt, which takes an ArrayRef<std::string>.

More details in this thread:
https://lists.llvm.org/pipermail/cfe-dev/2021-September/068936.html

Diff Detail

Event Timeline

rovka created this revision.Sep 22 2021, 12:23 AM
Herald added subscribers: wenzhicui, wrengr, Chia-hungDuan and 18 others. · View Herald TranscriptSep 22 2021, 12:23 AM
rovka requested review of this revision.Sep 22 2021, 12:23 AM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald TranscriptSep 22 2021, 12:23 AM
Harbormaster completed remote builds in B125054: Diff 374129.Sep 22 2021, 12:35 AM
rovka updated this revision to Diff 374177.Sep 22 2021, 4:05 AM
Harbormaster completed remote builds in B125085: Diff 374177.Sep 22 2021, 4:12 AM
jpienaar accepted this revision.Sep 22 2021, 4:49 AM
This revision is now accepted and ready to land.Sep 22 2021, 4:49 AM
mehdi_amini accepted this revision.Sep 22 2021, 9:43 AM
This revision was landed with ongoing or failed builds.Sep 23 2021, 12:07 AM
Closed by commit rGb7050c791d89: [mlir] Fix build on Windows on Arm (authored by rovka). · Explain Why
This revision was automatically updated to reflect the committed changes.
rovka added a commit: rGb7050c791d89: [mlir] Fix build on Windows on Arm.

Revision Contents

PathSize
mlir/
tools/
mlir-tblgen/
6 lines

Diff 374129

mlir/tools/mlir-tblgen/RewriterGen.cpp

Show First 20 Lines • Show All 442 Lines • ▼ Show 20 Lines if (tail.returnType)
PrintFatalError(loc, "`NativeCodeCall` cannot have return type specifier"); PrintFatalError(loc, "`NativeCodeCall` cannot have return type specifier");
auto locToUse = getLocation(tail); auto locToUse = getLocation(tail);
auto fmt = tree.getNativeCodeTemplate(); auto fmt = tree.getNativeCodeTemplate();
if (fmt.count("$_self") != 1) if (fmt.count("$_self") != 1)
PrintFatalError(loc, "NativeCodeCall must have $_self as argument for " PrintFatalError(loc, "NativeCodeCall must have $_self as argument for "
"passing the defining Operation"); "passing the defining Operation");
auto nativeCodeCall = std::string(tgfmt( auto nativeCodeCall = std::string(tgfmt(
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-  auto nativeCodeCall = std::string(tgfmt(
-      fmt, &fmtCtx.addSubst("_loc", locToUse).withSelf(opName.str()),
-      static_cast<ArrayRef<std::string>>(capture)));
+  auto nativeCodeCall = std::string(
+      tgfmt(fmt, &fmtCtx.addSubst("_loc", locToUse).withSelf(opName.str()),
+            static_cast<ArrayRef<std::string>>(capture)));
Lint: Pre-merge checks: clang-format: please reformat the code ``` - auto nativeCodeCall = std::string(tgfmt…
fmt, &fmtCtx.addSubst("_loc", locToUse).withSelf(opName.str()), capture)); fmt, &fmtCtx.addSubst("_loc", locToUse).withSelf(opName.str()),
static_cast<ArrayRef<std::string>>(capture)));
emitMatchCheck(opName, formatv("!failed({0})", nativeCodeCall), emitMatchCheck(opName, formatv("!failed({0})", nativeCodeCall),
formatv("\"{0} return failure\"", nativeCodeCall)); formatv("\"{0} return failure\"", nativeCodeCall));
for (int i = 0, e = tree.getNumArgs() - tail.numDirectives; i != e; ++i) { for (int i = 0, e = tree.getNumArgs() - tail.numDirectives; i != e; ++i) {
auto name = tree.getArgName(i); auto name = tree.getArgName(i);
if (!name.empty() && name != "_") { if (!name.empty() && name != "_") {
os << formatv("{0} = {1};\n", name, capture[i]); os << formatv("{0} = {1};\n", name, capture[i]);
▲ Show 20 Lines • Show All 686 Lines • ▼ Show 20 Lines for (int i = 0, e = tree.getNumArgs() - tail.numDirectives; i != e; ++i) {
} else { } else {
attrs.push_back( attrs.push_back(
handleOpArgument(tree.getArgAsLeaf(i), tree.getArgName(i))); handleOpArgument(tree.getArgAsLeaf(i), tree.getArgName(i)));
} }
LLVM_DEBUG(llvm::dbgs() << "NativeCodeCall argument #" << i LLVM_DEBUG(llvm::dbgs() << "NativeCodeCall argument #" << i
<< " replacement: " << attrs[i] << "\n"); << " replacement: " << attrs[i] << "\n");
} }
std::string symbol = tgfmt(fmt, &fmtCtx.addSubst("_loc", locToUse), attrs); std::string symbol = tgfmt(fmt, &fmtCtx.addSubst("_loc", locToUse),
static_cast<ArrayRef<std::string>>(attrs));
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-      static_cast<ArrayRef<std::string>>(attrs));
+                             static_cast<ArrayRef<std::string>>(attrs));
Lint: Pre-merge checks: clang-format: please reformat the code ``` - static_cast<ArrayRef<std::string>>(attrs)); +…
// In general, NativeCodeCall without naming binding don't need this. To // In general, NativeCodeCall without naming binding don't need this. To
// ensure void helper function has been correctly labeled, i.e., use // ensure void helper function has been correctly labeled, i.e., use
// NativeCodeCallVoid, we cache the result to a local variable so that we will // NativeCodeCallVoid, we cache the result to a local variable so that we will
// get a compilation error in the auto-generated file. // get a compilation error in the auto-generated file.
// Example. // Example.
// // In the td file // // In the td file
// Pat<(...), (NativeCodeCall<Foo> ...)> // Pat<(...), (NativeCodeCall<Foo> ...)>
▲ Show 20 Lines • Show All 503 Lines • Show Last 20 Lines