[ImportVerilog] Bump slang

CMakeLists.txt

@@ -551,14 +551,17 @@ llvm_canonicalize_cmake_booleans(CIRCT_SLANG_BUILD_FROM_SOURCE)
 if(CIRCT_SLANG_FRONTEND_ENABLED)
   message(STATUS "slang Verilog frontend is enabled")
   if(CIRCT_SLANG_BUILD_FROM_SOURCE)
+    # slang requires C++20
+    set(CMAKE_CXX_STANDARD 20)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
     # Build slang as part of CIRCT (see https://sv-lang.com/building.html)
     message(STATUS "Building slang from source")
     include(FetchContent)
     FetchContent_Declare(
       slang
       GIT_REPOSITORY https://github.com/MikePopoloski/slang.git
-      GIT_TAG v3.0
-      GIT_SHALLOW ON)
+      GIT_TAG bad0d6ba3dec20355b0156c535bbddf2f926ab37)
     set(FETCHCONTENT_TRY_FIND_PACKAGE_MODE "NEVER")
 
     # Force Slang to be built as a static library to avoid messing around with
@@ -573,6 +576,7 @@ if(CIRCT_SLANG_FRONTEND_ENABLED)
       set(CMAKE_CXX_FLAGS "")
     endif ()
     set(BUILD_SHARED_LIBS OFF)
+    set(SLANG_USE_MIMALLOC OFF)
     FetchContent_MakeAvailable(slang)
 
     set(CMAKE_CXX_FLAGS ${ORIGINAL_CMAKE_CXX_FLAGS})
@@ -581,7 +585,6 @@ if(CIRCT_SLANG_FRONTEND_ENABLED)
     if(BUILD_SHARED_LIBS)
       set_target_properties(slang_slang PROPERTIES POSITION_INDEPENDENT_CODE ON)
       set_target_properties(fmt PROPERTIES POSITION_INDEPENDENT_CODE ON)
-      set_target_properties(unordered_dense PROPERTIES POSITION_INDEPENDENT_CODE ON)
     endif()
 
     # The following feels *very* hacky, but CMake complains about the
@@ -590,17 +593,24 @@ if(CIRCT_SLANG_FRONTEND_ENABLED)
     # statically link slang into the CIRCTImportVerilog library, but seems to be
     # harder than it ought to be.
     set_property(
-      GLOBAL APPEND PROPERTY CIRCT_EXPORTS slang_slang unordered_dense fmt)
+      GLOBAL APPEND PROPERTY CIRCT_EXPORTS slang_slang fmt)
 
     # Disable the installation of headers coming from third-party libraries. We
     # won't use those APIs directly. Just make them static libraries for the sake
     # of running slang normally.
     set_target_properties(fmt PROPERTIES PUBLIC_HEADER "")
-    set_target_properties(unordered_dense PROPERTIES PUBLIC_HEADER "")
 
-    install(TARGETS slang_slang unordered_dense fmt EXPORT CIRCTTargets)
+    install(TARGETS slang_slang fmt EXPORT CIRCTTargets)
+
+    # Match the behavior of slang_slang, which installs its own vendored
+    # boost_unordered if it does not a system-wide boost installation.
+    find_package(Boost 1.82.0 QUIET)
+    if(NOT Boost_FOUND)
+      set_property(GLOBAL APPEND PROPERTY CIRCT_EXPORTS boost_unordered)
+      install(TARGETS boost_unordered EXPORT CIRCTTargets)
+    endif()
   else()
-    find_package(slang 3.0 REQUIRED)
+    find_package(slang 7.0 REQUIRED)
   endif()
 endif()
 

include/circt/Support/FVInt.h

@@ -646,8 +646,8 @@ inline FVInt operator-(uint64_t a, const FVInt &b) {
 
 inline FVInt operator-(const APInt &a, const FVInt &b) { return FVInt(a) - b; }
 
-inline bool operator==(uint64_t a, const FVInt &b) { return b == a; }
-inline bool operator!=(uint64_t a, const FVInt &b) { return b != a; }
+inline bool operator==(uint64_t a, const FVInt &b) { return b.operator==(a); }
+inline bool operator!=(uint64_t a, const FVInt &b) { return b.operator!=(a); }
 
 inline raw_ostream &operator<<(raw_ostream &os, const FVInt &value) {
   value.print(os);

lib/Conversion/ImportVerilog/CMakeLists.txt

@@ -1,6 +1,4 @@
 # slang uses exceptions
-set(LLVM_REQUIRES_EH ON)
-set(LLVM_REQUIRES_RTTI ON)
 
 # For ABI compatibility, define the DEBUG macro in debug builds. Slang sets this
 # internally. If we don't set this here as well, header-defined things like the
@@ -15,15 +13,10 @@ add_compile_definitions($<$<CONFIG:Debug>:DEBUG>)
 if (MSVC)
   # No idea what to put here
 else ()
-  # slang uses exceptions; we intercept these in ImportVerilog
-  add_compile_options(-fexceptions)
-  add_compile_options(-frtti)
   # slang has some classes with virtual funcs but non-virtual destructor.
   add_compile_options(-Wno-non-virtual-dtor)
   # some other warnings we've seen
-  add_compile_options(-Wno-c++98-compat-extra-semi)
   add_compile_options(-Wno-ctad-maybe-unsupported)
-  add_compile_options(-Wno-cast-qual)
   # visitor switch statements cover all cases but have default
   add_compile_options(-Wno-covered-switch-default)
 endif ()

lib/Conversion/ImportVerilog/Expressions.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ImportVerilogInternals.h"
+#include "slang/ast/EvalContext.h"
 #include "slang/ast/SystemSubroutine.h"
 #include "slang/syntax/AllSyntax.h"
 
@@ -526,7 +527,7 @@ struct RvalueExprVisitor {
       // The open range list on the right-hand side of the inside operator is a
       // comma-separated list of expressions or ranges.
       if (const auto *openRange =
-              listExpr->as_if<slang::ast::OpenRangeExpression>()) {
+              listExpr->as_if<slang::ast::ValueRangeExpression>()) {
         // Handle ranges.
         auto lowBound = context.convertToSimpleBitVector(
             context.convertRvalueExpression(openRange->left()));
@@ -1022,7 +1023,9 @@ slang::ConstantValue
 Context::evaluateConstant(const slang::ast::Expression &expr) {
   using slang::ast::EvalFlags;
   slang::ast::EvalContext evalContext(
-      compilation, EvalFlags::CacheResults | EvalFlags::SpecparamsAllowed);
+      slang::ast::ASTContext(compilation.getRoot(),
+                             slang::ast::LookupLocation::max),
+      EvalFlags::CacheResults | EvalFlags::SpecparamsAllowed);
   return expr.eval(evalContext);
 }
 

lib/Conversion/ImportVerilog/FormatStrings.cpp

@@ -7,15 +7,15 @@
 //===----------------------------------------------------------------------===//
 
 #include "ImportVerilogInternals.h"
-#include "slang/text/SFormat.h"
+#include "slang/ast/SFormat.h"
 
 using namespace mlir;
 using namespace circt;
 using namespace ImportVerilog;
 using moore::IntAlign;
 using moore::IntFormat;
 using moore::IntPadding;
-using slang::SFormat::FormatOptions;
+using slang::ast::SFormat::FormatOptions;
 
 namespace {
 struct FormatStringParser {
@@ -87,7 +87,7 @@ struct FormatStringParser {
     auto onError = [&](auto, auto, auto, auto) {
       assert(false && "Slang should have already reported all errors");
     };
-    slang::SFormat::parse(format, onText, onArg, onError);
+    slang::ast::SFormat::parse(format, onText, onArg, onError);
     return failure(anyFailure);
   }
 
@@ -191,7 +191,7 @@ struct FormatStringParser {
 } // namespace
 
 FailureOr<Value> Context::convertFormatString(
-    slang::span<const slang::ast::Expression *const> arguments, Location loc,
+    std::span<const slang::ast::Expression *const> arguments, Location loc,
     IntFormat defaultFormat, bool appendNewline) {
   FormatStringParser parser(*this, ArrayRef(arguments.data(), arguments.size()),
                             loc, defaultFormat);

lib/Conversion/ImportVerilog/ImportVerilog.cpp

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "ImportVerilogInternals.h"
-#include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Diagnostics.h"
 #include "mlir/IR/Verifier.h"
 #include "mlir/Support/Timing.h"
@@ -23,7 +22,7 @@
 #include "slang/driver/Driver.h"
 #include "slang/parsing/Preprocessor.h"
 #include "slang/syntax/SyntaxPrinter.h"
-#include "slang/util/Version.h"
+#include "slang/util/VersionInfo.h"
 
 using namespace mlir;
 using namespace circt;
@@ -92,11 +91,10 @@ class MlirDiagnosticClient : public slang::DiagnosticClient {
       mlirDiag << " [-W" << optionName << "]";
 
     // Write out macro expansions, if we have any, in reverse order.
-    for (auto it = diag.expansionLocs.rbegin(); it != diag.expansionLocs.rend();
-         it++) {
+    for (auto loc : std::views::reverse(diag.expansionLocs)) {
       auto &note = mlirDiag.attachNote(
-          convertLocation(sourceManager->getFullyOriginalLoc(*it)));
-      auto macroName = sourceManager->getMacroName(*it);
+          convertLocation(sourceManager->getFullyOriginalLoc(loc)));
+      auto macroName = sourceManager->getMacroName(loc);
       if (macroName.empty())
         note << "expanded from here";
       else
@@ -202,15 +200,29 @@ LogicalResult ImportDriver::prepareDriver(SourceMgr &sourceMgr) {
     const llvm::MemoryBuffer *mlirBuffer = sourceMgr.getMemoryBuffer(i + 1);
     auto slangBuffer = driver.sourceManager.assignText(
         mlirBuffer->getBufferIdentifier(), mlirBuffer->getBuffer());
-    driver.buffers.push_back(slangBuffer);
+    driver.sourceLoader.addBuffer(slangBuffer);
     bufferFilePaths.insert({slangBuffer.id, mlirBuffer->getBufferIdentifier()});
   }
 
+  for (const auto &libDir : options.libDirs)
+    driver.sourceLoader.addSearchDirectories(libDir);
+
+  for (const auto &libExt : options.libExts)
+    driver.sourceLoader.addSearchExtension(libExt);
+
+  for (const auto &includeDir : options.includeDirs) {
+    if (driver.sourceManager.addUserDirectories(includeDir)) {
+      return failure();
+    }
+  }
+
+  for (const auto &includeDir : options.includeSystemDirs) {
+    if (driver.sourceManager.addSystemDirectories(includeDir)) {
+      return failure();
+    }
+  }
+
   // Populate the driver options.
-  driver.options.includeDirs = options.includeDirs;
-  driver.options.includeSystemDirs = options.includeSystemDirs;
-  driver.options.libDirs = options.libDirs;
-  driver.options.libExts = options.libExts;
   driver.options.excludeExts.insert(options.excludeExts.begin(),
                                     options.excludeExts.end());
   driver.options.ignoreDirectives = options.ignoreDirectives;
@@ -221,22 +233,22 @@ LogicalResult ImportDriver::prepareDriver(SourceMgr &sourceMgr) {
   driver.options.librariesInheritMacros = options.librariesInheritMacros;
 
   driver.options.timeScale = options.timeScale;
-  driver.options.allowUseBeforeDeclare = options.allowUseBeforeDeclare;
-  driver.options.ignoreUnknownModules = options.ignoreUnknownModules;
-  driver.options.onlyLint =
-      options.mode == ImportVerilogOptions::Mode::OnlyLint;
+  driver.options.compilationFlags.emplace(
+      slang::ast::CompilationFlags::AllowUseBeforeDeclare,
+      options.allowUseBeforeDeclare);
+  driver.options.compilationFlags.emplace(
+      slang::ast::CompilationFlags::IgnoreUnknownModules,
+      options.ignoreUnknownModules);
+  driver.options.compilationFlags.emplace(
+      slang::ast::CompilationFlags::LintMode,
+      options.mode == ImportVerilogOptions::Mode::OnlyLint);
   driver.options.topModules = options.topModules;
   driver.options.paramOverrides = options.paramOverrides;
 
   driver.options.errorLimit = options.errorLimit;
   driver.options.warningOptions = options.warningOptions;
-  driver.options.suppressWarningsPaths = options.suppressWarningsPaths;
 
   driver.options.singleUnit = options.singleUnit;
-  driver.options.libraryFiles = options.libraryFiles;
-
-  for (auto &dir : sourceMgr.getIncludeDirs())
-    driver.options.includeDirs.push_back(dir);
 
   return success(driver.processOptions());
 }
@@ -318,12 +330,12 @@ LogicalResult ImportDriver::preprocessVerilog(llvm::raw_ostream &os) {
                                               diagnostics, optionBag);
     // Sources have to be pushed in reverse, as they form a stack in the
     // preprocessor. Last pushed source is processed first.
-    for (auto &buffer : slang::make_reverse_range(driver.buffers))
+    for (auto &buffer : std::views::reverse(driver.sourceLoader.loadSources()))
       preprocessor.pushSource(buffer);
     if (failed(preprocessAndPrint(preprocessor)))
       return failure();
   } else {
-    for (auto &buffer : driver.buffers) {
+    for (auto &buffer : driver.sourceLoader.loadSources()) {
       slang::BumpAllocator alloc;
       slang::Diagnostics diagnostics;
       slang::parsing::Preprocessor preprocessor(driver.sourceManager, alloc,
@@ -341,28 +353,15 @@ LogicalResult ImportDriver::preprocessVerilog(llvm::raw_ostream &os) {
 // Entry Points
 //===----------------------------------------------------------------------===//
 
-/// Execute a callback and report any thrown exceptions as "internal slang
-/// error" MLIR diagnostics.
-static LogicalResult
-catchExceptions(llvm::function_ref<LogicalResult()> callback) {
-  try {
-    return callback();
-  } catch (const std::exception &e) {
-    return emitError(UnknownLoc(), "internal slang error: ") << e.what();
-  }
-}
-
 /// Parse the specified Verilog inputs into the specified MLIR context.
 LogicalResult circt::importVerilog(SourceMgr &sourceMgr,
                                    MLIRContext *mlirContext, TimingScope &ts,
                                    ModuleOp module,
                                    const ImportVerilogOptions *options) {
-  return catchExceptions([&] {
-    ImportDriver importDriver(mlirContext, ts, options);
-    if (failed(importDriver.prepareDriver(sourceMgr)))
-      return failure();
-    return importDriver.importVerilog(module);
-  });
+  ImportDriver importDriver(mlirContext, ts, options);
+  if (failed(importDriver.prepareDriver(sourceMgr)))
+    return failure();
+  return importDriver.importVerilog(module);
 }
 
 /// Run the files in a source manager through Slang's Verilog preprocessor and
@@ -371,12 +370,10 @@ LogicalResult circt::preprocessVerilog(SourceMgr &sourceMgr,
                                        MLIRContext *mlirContext,
                                        TimingScope &ts, llvm::raw_ostream &os,
                                        const ImportVerilogOptions *options) {
-  return catchExceptions([&] {
-    ImportDriver importDriver(mlirContext, ts, options);
-    if (failed(importDriver.prepareDriver(sourceMgr)))
-      return failure();
-    return importDriver.preprocessVerilog(os);
-  });
+  ImportDriver importDriver(mlirContext, ts, options);
+  if (failed(importDriver.prepareDriver(sourceMgr)))
+    return failure();
+  return importDriver.preprocessVerilog(os);
 }
 
 /// Entry point as an MLIR translation.

lib/Conversion/ImportVerilog/ImportVerilogInternals.h

@@ -140,7 +140,7 @@ struct Context {
   /// failure if an error occurs. Returns a null value if the formatted string
   /// is trivially empty. Otherwise returns the formatted string.
   FailureOr<Value> convertFormatString(
-      slang::span<const slang::ast::Expression *const> arguments, Location loc,
+      std::span<const slang::ast::Expression *const> arguments, Location loc,
       moore::IntFormat defaultFormat = moore::IntFormat::Decimal,
       bool appendNewline = false);
 

lib/Conversion/ImportVerilog/Structure.cpp

@@ -602,15 +602,15 @@ Context::convertModuleHeader(const slang::ast::InstanceBodySymbol *module) {
   using slang::ast::PortSymbol;
   using slang::ast::TypeParameterSymbol;
 
-  auto parameters = module->parameters;
+  auto parameters = module->getParameters();
   bool hasModuleSame = false;
   // If there is already exist a module that has the same name with this
   // module ,has the same parent scope and has the same parameters we can
   // define this module is a duplicate module
   for (auto const &existingModule : modules) {
     if (module->getDeclaringDefinition() ==
         existingModule.getFirst()->getDeclaringDefinition()) {
-      auto moduleParameters = existingModule.getFirst()->parameters;
+      auto moduleParameters = existingModule.getFirst()->getParameters();
       hasModuleSame = true;
       for (auto it1 = parameters.begin(), it2 = moduleParameters.begin();
            it1 != parameters.end() && it2 != moduleParameters.end();

test/circt-verilog/commandline.sv

@@ -3,4 +3,4 @@
 // REQUIRES: slang
 
 // CHECK-HELP: OVERVIEW: Verilog and SystemVerilog frontend
-// CHECK-VERSION: slang version 3.
+// CHECK-VERSION: slang version 7.

test/circt-verilog/preprocess-errors.sv

@@ -1,5 +1,5 @@
 // RUN: circt-verilog %s -E --verify-diagnostics
 // REQUIRES: slang
 
-// expected-error @below {{could not find or open include file}}
+// expected-error @below {{'unknown.sv': No such file or directory}}
 `include "unknown.sv"