Bump LLVM to b6772e6e2045ab491b41d3767f788250800f97ea. (#4444)

This is NFC. The only change is related to the transition from llvm::None to std::nullopt, so I cleaned those up. This LLVM commit includes a few additions to the MLIR Python API that will be good to build on top of.
llvm · Dec 16, 2022 · d0462e7 · d0462e7
1 parent acf3e44
commit d0462e7
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 11 deletions.
diff --git a/include/circt/Dialect/FSM/FSMOps.td b/include/circt/Dialect/FSM/FSMOps.td
@@ -239,7 +239,7 @@ def OutputOp : FSMOp<"output", [HasParent<"StateOp">, ReturnLike, Terminator]> {
 
   let arguments = (ins Variadic<AnyType>:$operands);
 
-  let builders = [ OpBuilder<(ins), "build($_builder, $_state, llvm::None);"> ];
+  let builders = [ OpBuilder<(ins), "build($_builder, $_state, std::nullopt);"> ];
 
   let assemblyFormat = [{ attr-dict ($operands^ `:` qualified(type($operands)))? }];
 

diff --git a/include/circt/Dialect/HW/HWStructure.td b/include/circt/Dialect/HW/HWStructure.td
@@ -535,7 +535,7 @@ def OutputOp : HWOp<"output", [Terminator, HasParent<"HWModuleOp">,
   let arguments = (ins Variadic<AnyType>:$outputs);
 
   let builders = [
-    OpBuilder<(ins), "build($_builder, $_state, llvm::None);">
+    OpBuilder<(ins), "build($_builder, $_state, std::nullopt);">
   ];
 
   let assemblyFormat = "attr-dict ($outputs^ `:` qualified(type($outputs)))?";

diff --git a/include/circt/Dialect/Interop/Interop.td b/include/circt/Dialect/Interop/Interop.td
@@ -204,7 +204,7 @@ def ReturnOp : InteropOp<"return", [
   let arguments = (ins Variadic<AnyType>:$returnValues);
 
   let builders = [OpBuilder<(ins), [{
-    build($_builder, $_state, llvm::None);
+    build($_builder, $_state, std::nullopt);
   }]>];
 
   let assemblyFormat = "attr-dict ($returnValues^ `:` type($returnValues))?";

diff --git a/include/circt/Dialect/SystemC/SystemCStructure.td b/include/circt/Dialect/SystemC/SystemCStructure.td
@@ -477,7 +477,7 @@ def ReturnOp : SystemCOp<"cpp.return", [
   let arguments = (ins Variadic<AnyType>:$returnValues);
 
   let builders = [OpBuilder<(ins), [{
-    build($_builder, $_state, llvm::None);
+    build($_builder, $_state, std::nullopt);
   }]>];
 
   let assemblyFormat = "attr-dict ($returnValues^ `:` type($returnValues))?";

diff --git a/lib/Dialect/FIRRTL/FIRRTLUtils.cpp b/lib/Dialect/FIRRTL/FIRRTLUtils.cpp
@@ -663,12 +663,12 @@ circt::firrtl::maybeStringToLocation(StringRef spelling, bool skipParsing,
   unsigned lineNo = 0, columnNo = 0;
   StringRef filename = decodeLocator(spelling, lineNo, columnNo);
   if (filename.empty())
-    return {false, llvm::None};
+    return {false, std::nullopt};
 
   // If info locators are ignored, don't actually apply them.  We still do all
   // the verification above though.
   if (skipParsing)
-    return {true, llvm::None};
+    return {true, std::nullopt};
 
   /// Return an FileLineColLoc for the specified location, but use a bit of
   /// caching to reduce thrasing the MLIRContext.

diff --git a/lib/Dialect/MSFT/DeviceDB.cpp b/lib/Dialect/MSFT/DeviceDB.cpp
@@ -379,7 +379,8 @@ void PlacementDB::walkPlacements(
   // X loop.
   SmallVector<std::pair<size_t, DimYMap>> cols(placements.begin(),
                                                placements.end());
-  maybeSort(cols, walkOrder.transform([](auto wo) { return wo.columns; }));
+  maybeSort(cols, llvm::transformOptional(walkOrder,
+                                          [](auto wo) { return wo.columns; }));
   for (auto colF : cols) {
     size_t x = colF.first;
     if (x < xmin || x > xmax)
@@ -388,7 +389,8 @@ void PlacementDB::walkPlacements(
 
     // Y loop.
     SmallVector<std::pair<size_t, DimNumMap>> rows(yMap.begin(), yMap.end());
-    maybeSort(rows, walkOrder.transform([](auto wo) { return wo.rows; }));
+    maybeSort(rows, llvm::transformOptional(walkOrder,
+                                            [](auto wo) { return wo.rows; }));
     for (auto rowF : rows) {
       size_t y = rowF.first;
       if (y < ymin || y > ymax)

diff --git a/lib/Dialect/Moore/MooreTypes.cpp b/lib/Dialect/Moore/MooreTypes.cpp
@@ -770,7 +770,7 @@ Optional<Range> PackedDim::getRange() const {
 }
 
 Optional<unsigned> PackedDim::getSize() const {
-  return getRange().transform([](auto r) { return r.size; });
+  return llvm::transformOptional(getRange(), [](auto r) { return r.size; });
 }
 
 const detail::DimStorage *PackedDim::getImpl() const {

diff --git a/llvm b/llvm
diff --git a/tools/circt-reduce/Tester.cpp b/tools/circt-reduce/Tester.cpp
@@ -46,7 +46,7 @@ bool Tester::isInteresting(StringRef testCase) const {
   // Run the tester.
   std::string errMsg;
   int result = llvm::sys::ExecuteAndWait(
-      testScript, testerArgs, /*Env=*/None, /*Redirects=*/None,
+      testScript, testerArgs, /*Env=*/std::nullopt, /*Redirects=*/std::nullopt,
       /*SecondsToWait=*/0, /*MemoryLimit=*/0, &errMsg);
   if (result < 0)
     llvm::report_fatal_error(