intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-17 06:40:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[mlir] Reland 5a6e52d6ef with update (NFC)

Browse Source 
Excluded updates to mlir/lib/AsmParser/Parser.cpp ,
which caused LIT failure "FAIL: MLIR::completion.test" on multiple buildbots.
This commit is contained in:
JOE1994
2024-09-15 21:12:09 -04:00
parent 0c55ad11ab
commit 095b41c6ee
13 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mlir/lib/Bindings/Python/IRAttributes.cpp
View File

@@ -708,7 +708,7 @@ public:
llvm::raw_string_ostream os(message);
os << "Expected a static ShapedType for the shaped_type parameter: "
<< py::repr(py::cast(*explicitType));
throw py::value_error(os.str());
throw py::value_error(message);
}
shapedType = *explicitType;
} else {
@@ -732,7 +732,7 @@ public:
os << "All attributes must be of the same type and match "
<< "the type parameter: expected=" << py::repr(py::cast(shapedType))
<< ", but got=" << py::repr(py::cast(attrType));
throw py::value_error(os.str());
throw py::value_error(message);
}
}

2
mlir/lib/TableGen/CodeGenHelpers.cpp
View File

@@ -315,5 +315,5 @@ std::string mlir::tblgen::escapeString(StringRef value) {
std::string ret;
llvm::raw_string_ostream os(ret);
os.write_escaped(value);
return os.str();
return ret;
}

2
mlir/lib/TableGen/Predicate.cpp
View File

@@ -301,7 +301,7 @@ static std::string combineBinary(ArrayRef<std::string> children,
for (unsigned i = 1; i < size; ++i) {
os << ' ' << combiner << " (" << children[i] << ')';
}
return os.str();
return str;
}
// Prepend negation to the only condition in the predicate expression list.

2
mlir/lib/Target/LLVM/ModuleToObject.cpp
View File

@@ -182,7 +182,7 @@ ModuleToObject::translateToISA(llvm::Module &llvmModule,
codegenPasses.run(llvmModule);
}
return stream.str();
return targetISA;
}
void ModuleToObject::setDataLayoutAndTriple(llvm::Module &module) {

2
mlir/lib/Target/LLVMIR/ConvertFromLLVMIR.cpp
View File

@@ -50,7 +50,7 @@ void registerFromLLVMIRTranslation() {
std::string errStr;
llvm::raw_string_ostream errStream(errStr);
err.print(/*ProgName=*/"", errStream);
emitError(UnknownLoc::get(context)) << errStream.str();
emitError(UnknownLoc::get(context)) << errStr;
return {};
}
if (llvm::verifyModule(*llvmModule, &llvm::errs()))

2
mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp
View File

@@ -62,7 +62,7 @@ static std::string diagStr(const llvm::Type *type) {
std::string str;
llvm::raw_string_ostream os(str);
type->print(os);
return os.str();
return str;
}
/// Get the declaration of an overloaded llvm intrinsic. First we get the

2
mlir/lib/Target/LLVMIR/Dialect/OpenMPCommon.cpp
View File

@@ -25,7 +25,7 @@ mlir::LLVM::createSourceLocStrFromLocation(Location loc,
std::string locStr;
llvm::raw_string_ostream locOS(locStr);
locOS << loc;
return builder.getOrCreateSrcLocStr(locOS.str(), strLen);
return builder.getOrCreateSrcLocStr(locStr, strLen);
}
llvm::Constant *

4
mlir/lib/Target/LLVMIR/ModuleImport.cpp
View File

@@ -55,7 +55,7 @@ static std::string diag(const llvm::Value &value) {
std::string str;
llvm::raw_string_ostream os(str);
os << value;
return os.str();
return str;
}
// Utility to print an LLVM metadata node as a string for passing
@@ -66,7 +66,7 @@ static std::string diagMD(const llvm::Metadata *node,
std::string str;
llvm::raw_string_ostream os(str);
node->print(os, module, /*IsForDebug=*/true);
return os.str();
return str;
}
/// Returns the name of the global_ctors global variables.

2
mlir/lib/Target/SPIRV/Serialization/SerializeOps.cpp
View File

@@ -137,7 +137,7 @@ Serializer::processSpecConstantOperationOp(spirv::SpecConstantOperationOp op) {
std::string enclosedOpName;
llvm::raw_string_ostream rss(enclosedOpName);
rss << "Op" << enclosedOp.getName().stripDialect();
auto enclosedOpcode = spirv::symbolizeOpcode(rss.str());
auto enclosedOpcode = spirv::symbolizeOpcode(enclosedOpName);
if (!enclosedOpcode) {
op.emitError("Couldn't find op code for op ")

4
mlir/lib/Target/SPIRV/Serialization/Serializer.cpp
View File

@@ -915,7 +915,7 @@ uint32_t Serializer::prepareConstantInt(Location loc, IntegerAttr intAttr,
value.print(rss, /*isSigned=*/false);
emitError(loc, "cannot serialize ")
<< bitwidth << "-bit integer literal: " << rss.str();
<< bitwidth << "-bit integer literal: " << valueStr;
return 0;
}
}
@@ -968,7 +968,7 @@ uint32_t Serializer::prepareConstantFp(Location loc, FloatAttr floatAttr,
value.print(rss);
emitError(loc, "cannot serialize ")
<< floatAttr.getType() << "-typed float literal: " << rss.str();
<< floatAttr.getType() << "-typed float literal: " << valueStr;
return 0;
}

3
mlir/lib/Tools/PDLL/Parser/Parser.cpp
View File

@@ -148,9 +148,8 @@ private:
std::string docStr;
{
llvm::raw_string_ostream docOS(docStr);
std::string tmpDocStr = doc.str();
raw_indented_ostream(docOS).printReindented(
StringRef(tmpDocStr).rtrim(" \t"));
StringRef(docStr).rtrim(" \t"));
}
return docStr;
}

3
mlir/lib/Tools/mlir-opt/MlirOptMain.cpp
View File

@@ -312,8 +312,7 @@ static LogicalResult doVerifyRoundTrip(Operation *op,
FallbackAsmResourceMap fallbackResourceMap;
ParserConfig parseConfig(&roundtripContext, /*verifyAfterParse=*/true,
&fallbackResourceMap);
roundtripModule =
parseSourceString<Operation *>(ostream.str(), parseConfig);
roundtripModule = parseSourceString<Operation *>(buffer, parseConfig);
if (!roundtripModule) {
op->emitOpError() << "failed to parse " << testType
<< " content back, cannot verify round-trip.\n";

6
mlir/lib/Transforms/ViewOpGraph.cpp
View File

@@ -46,7 +46,7 @@ static std::string strFromOs(function_ref<void(raw_ostream &)> func) {
std::string buf;
llvm::raw_string_ostream os(buf);
func(os);
return os.str();
return buf;
}
/// Escape special characters such as '\n' and quotation marks.
@@ -199,7 +199,7 @@ private:
std::string buf;
llvm::raw_string_ostream ss(buf);
attr.print(ss);
os << truncateString(ss.str());
os << truncateString(buf);
}
/// Append an edge to the list of edges.
@@ -262,7 +262,7 @@ private:
std::string buf;
llvm::raw_string_ostream ss(buf);
interleaveComma(op->getResultTypes(), ss);
os << truncateString(ss.str()) << ")";
os << truncateString(buf) << ")";
}
// Print attributes.