[ImportVerilog] Bump slang

.github/workflows/buildAndTest.yml

@@ -14,7 +14,7 @@ jobs:
     name: Sanity Check
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/circt/images/circt-ci-build:20240213211952
+      image: ghcr.io/circt/images/circt-ci-build:20241113160334
     steps:
       # Clone the CIRCT repo and its submodules. Do shallow clone to save clone
       # time.
@@ -134,7 +134,7 @@ jobs:
     # John and re-run the job.
     runs-on: ["self-hosted", "1ES.Pool=1ES-CIRCT-builds", "linux"]
     container:
-      image: ghcr.io/circt/images/circt-ci-build:20240213211952
+      image: ghcr.io/circt/images/circt-ci-build:20241113160334
       volumes:
         - /mnt:/__w/circt
     strategy:
@@ -143,13 +143,13 @@ jobs:
           # Our PR builds are trying to test the two corners of the build matrix:
           # clang + release + noassert + static
           # gcc   + debug   + assert   + shared
-          - cc: clang
-            cxx: clang++
+          - cc: clang-17
+            cxx: clang++-17
             mode: Debug
             assert: ON
             shared: ON
-          - cc: gcc
-            cxx: g++
+          - cc: gcc-11
+            cxx: g++-11
             mode: Release
             assert: OFF
             shared: OFF

.github/workflows/nightlyIntegrationTests.yml

@@ -19,7 +19,7 @@ jobs:
     # John and re-run the job.
     runs-on: ["self-hosted", "1ES.Pool=1ES-CIRCT-builds", "linux"]
     container:
-      image: ghcr.io/circt/images/circt-integration-test:v13.1
+      image: ghcr.io/circt/images/circt-integration-test:v15.1
       volumes:
         - /mnt:/__w/circt
     strategy:
@@ -32,10 +32,10 @@ jobs:
         build-shared: [ON, OFF]
         build-type: [Debug, Release]
         compiler:
-          - cc: clang
-            cxx: clang++
-          - cc: gcc
-            cxx: g++
+          - cc: clang-17
+            cxx: clang++-17
+          - cc: gcc-11
+            cxx: g++-11
         lit-flags: ['', '--vg']
         exclude:
           - build-type: Debug
@@ -48,7 +48,7 @@ jobs:
             build-shared: ON
           # TODO: This corner is failing and has been for some time. #5253.
           - build-type: Release
-            compiler: {cc: gcc, cxx: g++}
+            compiler: {cc: gcc-11, cxx: g++-11}
             lit-flags: --vg
 
     steps:

.github/workflows/shortIntegrationTests.yml

@@ -29,7 +29,7 @@ jobs:
     # John and re-run the job.
     runs-on: ["self-hosted", "1ES.Pool=1ES-CIRCT-builds", "linux"]
     container:
-      image: ghcr.io/circt/images/circt-integration-test:v13.1
+      image: ghcr.io/circt/images/circt-integration-test:v15.1
       volumes:
         - /mnt:/__w/circt
     strategy:
@@ -40,8 +40,8 @@ jobs:
         build-shared: [ON]
         build-type: [Release]
         compiler:
-          - cc: clang
-            cxx: clang++
+          - cc: clang-17
+            cxx: clang++-17
 
     steps:
       # Clone the CIRCT repo and its submodules. Do shallow clone to save clone

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,7 +1,3 @@
-# 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
 # destructor of `Driver`, which is generated in ImportVerilog's compilation
@@ -15,19 +11,18 @@ 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 ()
 
+# HACK: Setting `XCODE` to avoid adding `OBJECT` argument to
+# `llvm_add_library()`, because the resulting object does not have the
+# transitively inherit `COMPILE_DEFINITIONS` from `slang_slang`.
+set(XCODE ON)
 add_circt_translation_library(CIRCTImportVerilog
   Expressions.cpp
   FormatStrings.cpp

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);