diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile index 339b66e18995..7e34c10e0d54 100644 --- a/cad/surelog/Makefile +++ b/cad/surelog/Makefile @@ -1,74 +1,72 @@ PORTNAME= surelog DISTVERSIONPREFIX= v -DISTVERSION= 1.84 -PORTREVISION= 1 -CATEGORIES= cad +DISTVERSION= 1.86 +CATEGORIES= cad java MAINTAINER= yuri@FreeBSD.org COMMENT= SystemVerilog 2017 Pre-processor, Parser, Elaborator, etc WWW= https://github.com/chipsalliance/Surelog LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_aarch64= compilation fails: Creating OVM precompiled package... Segmentation fault (core dumped) # update to the current revision might help but it has C++ errors BROKEN_armv6= compilation fails: Creating OVM precompiled package... libunwind: personality function returned unknown result 5 -BROKEN_i386= compilation fails: conversion function cannot be redeclared, see https://github.com/chipsalliance/Surelog/issues/3206 BUILD_DEPENDS= utf8cpp>0:devel/utf8cpp \ ${PYTHON_PKGNAMEPREFIX}orderedmultidict>0:devel/py-orderedmultidict@${PY_FLAVOR} -BUILD_DEPENDS+= googletest>0:devel/googletest # workaround for https://github.com/chipsalliance/Surelog/issues/3826 LIB_DEPENDS= libcapnp.so:devel/capnproto \ libuhdm.so:cad/uhdm TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing compiler:c++17-lang java:build localbase:ldflags tcl:86,build USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/surelog JAVA_VERSION= 17 # Java selection fails in cmake when Java 11 is also installed, see https://gitlab.kitware.com/cmake/cmake/-/issues/24674 USE_GITHUB= yes GH_ACCOUNT= chipsalliance GH_PROJECT= Surelog -GH_TUPLE= alainmarcel:antlr4:a27cf84:antlr4/third_party/antlr4 \ - nlohmann:json:788e546:json/third_party/json +GH_TUPLE= alainmarcel:antlr4:6a15cc32de:antlr4/third_party/antlr4 \ + nlohmann:json:788e5468e4:json/third_party/json +CMAKE_ARGS= -DFREEBSD_JAVA_VERSION=${JAVA_VERSION} \ + -DPython3_EXECUTABLE=${PYTHON_CMD} CMAKE_ON= BUILD_SHARED_LIBS \ SURELOG_USE_HOST_UHDM \ SURELOG_USE_HOST_CAPNP \ SURELOG_USE_HOST_GTEST CMAKE_OFF= SURELOG_BUILD_TESTS -CMAKE_ARGS= -DFREEBSD_JAVA_VERSION=${JAVA_VERSION} \ - -DPython3_EXECUTABLE=${PYTHON_CMD} CMAKE_TESTING_ON= SURELOG_BUILD_TESTS # 2 tests fail, see https://github.com/chipsalliance/Surelog/issues/3545 CMAKE_TESTING_TARGET= UnitTests +CONFLICTS_BUILD= openjdk8 openjdk11 openjdk18 openjdk19 + BINARY_ALIAS= python3=${PYTHON_CMD} tclsh=${TCLSH} +PORTSCOUT= limit:^.*[0-9]\.[0-9] # prevent tags like 'show' -CONFLICTS_BUILD= openjdk8 openjdk11 openjdk18 openjdk19 +PLIST_SUB= SOVERSION=${DISTVERSION} OPTIONS_DEFINE= PYTHON TCMALLOC OPTIONS_DEFAULT= PYTHON TCMALLOC # should be the same TCMALLOC default as in cad/yosys, cad/uhdm because surelog's lib is used in the yosys plugin cad/yosys-systemverilog OPTIONS_SUB= yes +PYTHON_BUILD_DEPENDS= swig:devel/swig PYTHON_USES= python PYTHON_USES_OFF= python:build -PYTHON_BUILD_DEPENDS= swig:devel/swig PYTHON_CMAKE_BOOL= SURELOG_WITH_PYTHON PYTHON_CMAKE_ON= -DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION} -TCMALLOC_CMAKE_BOOL= SURELOG_WITH_TCMALLOC TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools - -PORTSCOUT= limit:^.*[0-9]\.[0-9] # prevent tags like 'show' +TCMALLOC_CMAKE_BOOL= SURELOG_WITH_TCMALLOC post-install: # workaround for https://github.com/chipsalliance/Surelog/issues/3965 # - surelog fails to create package files on some systems, and succeeds on others # - so we remove this directory altogether for now @${RM} -r \ ${STAGEDIR}${DATADIR} post-test: # 9 tests fail, see https://github.com/chipsalliance/Surelog/issues/3971 @cd ${BUILD_WRKSRC} && ctest .include diff --git a/cad/surelog/distinfo b/cad/surelog/distinfo index 67a7a6783193..610dcd6f5d2c 100644 --- a/cad/surelog/distinfo +++ b/cad/surelog/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1723105478 -SHA256 (chipsalliance-Surelog-v1.84_GH0.tar.gz) = ddcbc0d943ee52f2487b7a064c57a8239d525efd9a45b1f3e3e4a96a56cb3377 -SIZE (chipsalliance-Surelog-v1.84_GH0.tar.gz) = 96078248 -SHA256 (alainmarcel-antlr4-a27cf84_GH0.tar.gz) = f1d2636c219d2fa9faad1672739e409d6a9a78ac1495a911ae2a5e43bd5194d1 -SIZE (alainmarcel-antlr4-a27cf84_GH0.tar.gz) = 4205182 -SHA256 (nlohmann-json-788e546_GH0.tar.gz) = 5d7e9a9fafbb0d0ddd6b1364fd701a86972782ca7c2dace80eefa9c312c5926f -SIZE (nlohmann-json-788e546_GH0.tar.gz) = 8039831 +TIMESTAMP = 1762226270 +SHA256 (chipsalliance-Surelog-v1.86_GH0.tar.gz) = 5bffc61334f38b16b5dd57e5209d38bc1e07b0e0bda452e4580678aa3e9daf53 +SIZE (chipsalliance-Surelog-v1.86_GH0.tar.gz) = 98792218 +SHA256 (alainmarcel-antlr4-6a15cc32de_GH0.tar.gz) = 836d9de8021f67710290812e24ed75c9131cb54f824939e311c516343a0fc55b +SIZE (alainmarcel-antlr4-6a15cc32de_GH0.tar.gz) = 4173382 +SHA256 (nlohmann-json-788e5468e4_GH0.tar.gz) = d3dff09c8c00c37cac1243f4dc9e29f2f593ec45832be3f6c3523960242fc855 +SIZE (nlohmann-json-788e5468e4_GH0.tar.gz) = 8040326 diff --git a/cad/surelog/files/patch-CMakeLists.txt b/cad/surelog/files/patch-CMakeLists.txt index 530c39f79b1d..5492941f2152 100644 --- a/cad/surelog/files/patch-CMakeLists.txt +++ b/cad/surelog/files/patch-CMakeLists.txt @@ -1,28 +1,28 @@ ---- CMakeLists.txt.orig 2023-04-25 18:21:08 UTC +--- CMakeLists.txt.orig 2025-08-30 03:55:56 UTC +++ CMakeLists.txt -@@ -141,14 +141,14 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BIN +@@ -172,14 +172,14 @@ if (SURELOG_WITH_PYTHON) # Python if (SURELOG_WITH_PYTHON) - find_package(Python3 REQUIRED COMPONENTS Interpreter Development) + find_package(Python3 ${FREEBSD_PYTHON_DISTVERSION} EXACT REQUIRED COMPONENTS Interpreter Development) find_package(SWIG REQUIRED) message(STATUS "Python3_LIBRARIES = ${Python3_LIBRARIES}") message(STATUS "Python3_EXECUTABLE = ${Python3_EXECUTABLE}") message(STATUS "Python3_INCLUDE_DIRS = ${Python3_INCLUDE_DIRS}") message(STATUS "Python3_RUNTIME_LIBRARY_DIRS = ${Python3_RUNTIME_LIBRARY_DIRS}") else() - find_package(Python3 3.3 REQUIRED Interpreter) + find_package(Python3 ${FREEBSD_PYTHON_DISTVERSION} EXACT REQUIRED Interpreter) message(STATUS "Python3_EXECUTABLE = ${Python3_EXECUTABLE}") endif() -@@ -231,7 +231,7 @@ add_custom_command( - ${PROJECT_SOURCE_DIR}/src/Cache/preproc.fbs) +@@ -278,7 +278,7 @@ add_custom_command( + ) # Java -find_package(Java 11 REQUIRED COMPONENTS Runtime) +find_package(Java ${FREEBSD_JAVA_VERSION} REQUIRED COMPONENTS Runtime) message(STATUS "Java_JAVA_EXECUTABLE = ${Java_JAVA_EXECUTABLE}") - add_custom_target(GenerateParser DEPENDS + set(surelog_grammars diff --git a/cad/surelog/files/patch-include_Surelog_DesignCompile_CompileHelper.h b/cad/surelog/files/patch-include_Surelog_DesignCompile_CompileHelper.h index 92844357ae19..c8dc6a0ce879 100644 --- a/cad/surelog/files/patch-include_Surelog_DesignCompile_CompileHelper.h +++ b/cad/surelog/files/patch-include_Surelog_DesignCompile_CompileHelper.h @@ -1,10 +1,10 @@ ---- include/Surelog/DesignCompile/CompileHelper.h.orig 2022-09-09 21:48:59 UTC +--- include/Surelog/DesignCompile/CompileHelper.h.orig 2025-08-30 03:55:56 UTC +++ include/Surelog/DesignCompile/CompileHelper.h -@@ -29,6 +29,7 @@ - #include +@@ -33,6 +33,7 @@ #include + #include +#include #include + #include #include - diff --git a/cad/surelog/files/patch-include_Surelog_Design_ModuleInstance.h b/cad/surelog/files/patch-include_Surelog_Design_ModuleInstance.h index d27da60b50e1..ac86272c4ca3 100644 --- a/cad/surelog/files/patch-include_Surelog_Design_ModuleInstance.h +++ b/cad/surelog/files/patch-include_Surelog_Design_ModuleInstance.h @@ -1,10 +1,10 @@ ---- include/Surelog/Design/ModuleInstance.h.orig 2022-09-09 21:24:46 UTC +--- include/Surelog/Design/ModuleInstance.h.orig 2025-08-30 03:55:56 UTC +++ include/Surelog/Design/ModuleInstance.h -@@ -30,6 +30,7 @@ - #include - #include +@@ -36,6 +36,7 @@ + #include + #include +#include - #include - - namespace SURELOG { + #include + #include + #include diff --git a/cad/surelog/files/patch-src_DesignCompile_CompileDesign.cpp b/cad/surelog/files/patch-src_DesignCompile_CompileDesign.cpp deleted file mode 100644 index 32c9cf656960..000000000000 --- a/cad/surelog/files/patch-src_DesignCompile_CompileDesign.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/DesignCompile/CompileDesign.cpp.orig 2022-09-09 21:31:51 UTC -+++ src/DesignCompile/CompileDesign.cpp -@@ -52,6 +52,7 @@ - #include - - #include -+#include - #include - - #ifdef USETBB diff --git a/cad/surelog/files/patch-src_DesignCompile_CompileExpression.cpp b/cad/surelog/files/patch-src_DesignCompile_CompileExpression.cpp deleted file mode 100644 index c102d2af1c5c..000000000000 --- a/cad/surelog/files/patch-src_DesignCompile_CompileExpression.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/DesignCompile/CompileExpression.cpp.orig 2022-09-09 21:42:55 UTC -+++ src/DesignCompile/CompileExpression.cpp -@@ -46,6 +46,7 @@ - - #include - #include -+#include - - // UHDM - #include diff --git a/cad/surelog/files/patch-src_DesignCompile_ElaborationStep.cpp b/cad/surelog/files/patch-src_DesignCompile_ElaborationStep.cpp deleted file mode 100644 index 4a3a95093586..000000000000 --- a/cad/surelog/files/patch-src_DesignCompile_ElaborationStep.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/DesignCompile/ElaborationStep.cpp.orig 2022-09-09 21:47:31 UTC -+++ src/DesignCompile/ElaborationStep.cpp -@@ -49,6 +49,7 @@ - - #include - #include -+#include - - // UHDM - #include diff --git a/cad/surelog/pkg-plist b/cad/surelog/pkg-plist index 3bc43123b053..6781e4073e07 100644 --- a/cad/surelog/pkg-plist +++ b/cad/surelog/pkg-plist @@ -1,89 +1,264 @@ bin/roundtrip bin/surelog include/Surelog/API/PythonAPI.h include/Surelog/API/SLAPI.h include/Surelog/API/Surelog.h include/Surelog/CommandLine/CommandLineParser.h include/Surelog/Common/ClockingBlockHolder.h include/Surelog/Common/Containers.h include/Surelog/Common/FileSystem.h include/Surelog/Common/NodeId.h include/Surelog/Common/PathId.h include/Surelog/Common/PlatformFileSystem.h include/Surelog/Common/PortNetHolder.h include/Surelog/Common/RTTI.h include/Surelog/Common/SymbolId.h include/Surelog/Config/Config.h include/Surelog/Config/ConfigSet.h include/Surelog/Design/BindStmt.h include/Surelog/Design/ClockingBlock.h include/Surelog/Design/DataType.h include/Surelog/Design/DefParam.h include/Surelog/Design/Design.h include/Surelog/Design/DesignComponent.h include/Surelog/Design/DesignElement.h include/Surelog/Design/DummyType.h include/Surelog/Design/Enum.h include/Surelog/Design/FileCNodeId.h include/Surelog/Design/FileContent.h include/Surelog/Design/Function.h include/Surelog/Design/Instance.h include/Surelog/Design/LetStmt.h include/Surelog/Design/ModPort.h include/Surelog/Design/ModuleDefinition.h include/Surelog/Design/ModuleInstance.h include/Surelog/Design/Netlist.h include/Surelog/Design/ParamAssign.h include/Surelog/Design/Parameter.h include/Surelog/Design/Scope.h include/Surelog/Design/Signal.h include/Surelog/Design/SimpleType.h include/Surelog/Design/Statement.h include/Surelog/Design/Struct.h include/Surelog/Design/Task.h include/Surelog/Design/TfPortItem.h include/Surelog/Design/TimeInfo.h include/Surelog/Design/Union.h include/Surelog/Design/VObject.h include/Surelog/Design/ValuedComponentI.h include/Surelog/DesignCompile/CompileHelper.h include/Surelog/ErrorReporting/Error.h include/Surelog/ErrorReporting/ErrorContainer.h include/Surelog/ErrorReporting/ErrorDefinition.h include/Surelog/ErrorReporting/Location.h include/Surelog/ErrorReporting/LogListener.h include/Surelog/ErrorReporting/Report.h include/Surelog/ErrorReporting/Waiver.h include/Surelog/Expression/ExprBuilder.h include/Surelog/Expression/Value.h include/Surelog/Library/Library.h include/Surelog/Library/LibrarySet.h include/Surelog/Package/Package.h include/Surelog/SourceCompile/ParseTreeListener.h include/Surelog/SourceCompile/ParseTreeTraceListener.h include/Surelog/SourceCompile/SymbolTable.h include/Surelog/SourceCompile/VObjectTypes.h include/Surelog/Testbench/ClassDefinition.h include/Surelog/Testbench/ClassObject.h include/Surelog/Testbench/Constraint.h include/Surelog/Testbench/CoverGroupDefinition.h include/Surelog/Testbench/FunctionMethod.h include/Surelog/Testbench/Program.h include/Surelog/Testbench/Property.h include/Surelog/Testbench/TaskMethod.h include/Surelog/Testbench/TypeDef.h include/Surelog/Testbench/Variable.h include/Surelog/config.h include/Surelog/surelog-version.h include/Surelog/surelog.h +include/antlr4-runtime/ANTLRErrorListener.h +include/antlr4-runtime/ANTLRErrorStrategy.h +include/antlr4-runtime/ANTLRFileStream.h +include/antlr4-runtime/ANTLRInputStream.h +include/antlr4-runtime/BailErrorStrategy.h +include/antlr4-runtime/BaseErrorListener.h +include/antlr4-runtime/BufferedTokenStream.h +include/antlr4-runtime/CharStream.h +include/antlr4-runtime/CommonToken.h +include/antlr4-runtime/CommonTokenFactory.h +include/antlr4-runtime/CommonTokenStream.h +include/antlr4-runtime/ConsoleErrorListener.h +include/antlr4-runtime/DefaultErrorStrategy.h +include/antlr4-runtime/DiagnosticErrorListener.h +include/antlr4-runtime/Exceptions.h +include/antlr4-runtime/FailedPredicateException.h +include/antlr4-runtime/FlatHashMap.h +include/antlr4-runtime/FlatHashSet.h +include/antlr4-runtime/InputMismatchException.h +include/antlr4-runtime/IntStream.h +include/antlr4-runtime/InterpreterRuleContext.h +include/antlr4-runtime/Lexer.h +include/antlr4-runtime/LexerInterpreter.h +include/antlr4-runtime/LexerNoViableAltException.h +include/antlr4-runtime/ListTokenSource.h +include/antlr4-runtime/NoViableAltException.h +include/antlr4-runtime/Parser.h +include/antlr4-runtime/ParserInterpreter.h +include/antlr4-runtime/ParserRuleContext.h +include/antlr4-runtime/ProxyErrorListener.h +include/antlr4-runtime/RecognitionException.h +include/antlr4-runtime/Recognizer.h +include/antlr4-runtime/RuleContext.h +include/antlr4-runtime/RuleContextWithAltNum.h +include/antlr4-runtime/RuntimeMetaData.h +include/antlr4-runtime/Token.h +include/antlr4-runtime/TokenFactory.h +include/antlr4-runtime/TokenSource.h +include/antlr4-runtime/TokenStream.h +include/antlr4-runtime/TokenStreamRewriter.h +include/antlr4-runtime/UnbufferedCharStream.h +include/antlr4-runtime/UnbufferedTokenStream.h +include/antlr4-runtime/Version.h +include/antlr4-runtime/Vocabulary.h +include/antlr4-runtime/WritableToken.h +include/antlr4-runtime/antlr4-common.h +include/antlr4-runtime/antlr4-runtime.h +include/antlr4-runtime/atn/ATN.h +include/antlr4-runtime/atn/ATNConfig.h +include/antlr4-runtime/atn/ATNConfigSet.h +include/antlr4-runtime/atn/ATNDeserializationOptions.h +include/antlr4-runtime/atn/ATNDeserializer.h +include/antlr4-runtime/atn/ATNSimulator.h +include/antlr4-runtime/atn/ATNState.h +include/antlr4-runtime/atn/ATNStateType.h +include/antlr4-runtime/atn/ATNType.h +include/antlr4-runtime/atn/ActionTransition.h +include/antlr4-runtime/atn/AmbiguityInfo.h +include/antlr4-runtime/atn/ArrayPredictionContext.h +include/antlr4-runtime/atn/AtomTransition.h +include/antlr4-runtime/atn/BasicBlockStartState.h +include/antlr4-runtime/atn/BasicState.h +include/antlr4-runtime/atn/BlockEndState.h +include/antlr4-runtime/atn/BlockStartState.h +include/antlr4-runtime/atn/ContextSensitivityInfo.h +include/antlr4-runtime/atn/DecisionEventInfo.h +include/antlr4-runtime/atn/DecisionInfo.h +include/antlr4-runtime/atn/DecisionState.h +include/antlr4-runtime/atn/EpsilonTransition.h +include/antlr4-runtime/atn/ErrorInfo.h +include/antlr4-runtime/atn/HashUtils.h +include/antlr4-runtime/atn/LL1Analyzer.h +include/antlr4-runtime/atn/LexerATNConfig.h +include/antlr4-runtime/atn/LexerATNSimulator.h +include/antlr4-runtime/atn/LexerAction.h +include/antlr4-runtime/atn/LexerActionExecutor.h +include/antlr4-runtime/atn/LexerActionType.h +include/antlr4-runtime/atn/LexerChannelAction.h +include/antlr4-runtime/atn/LexerCustomAction.h +include/antlr4-runtime/atn/LexerIndexedCustomAction.h +include/antlr4-runtime/atn/LexerModeAction.h +include/antlr4-runtime/atn/LexerMoreAction.h +include/antlr4-runtime/atn/LexerPopModeAction.h +include/antlr4-runtime/atn/LexerPushModeAction.h +include/antlr4-runtime/atn/LexerSkipAction.h +include/antlr4-runtime/atn/LexerTypeAction.h +include/antlr4-runtime/atn/LookaheadEventInfo.h +include/antlr4-runtime/atn/LoopEndState.h +include/antlr4-runtime/atn/NotSetTransition.h +include/antlr4-runtime/atn/OrderedATNConfigSet.h +include/antlr4-runtime/atn/ParseInfo.h +include/antlr4-runtime/atn/ParserATNSimulator.h +include/antlr4-runtime/atn/ParserATNSimulatorOptions.h +include/antlr4-runtime/atn/PlusBlockStartState.h +include/antlr4-runtime/atn/PlusLoopbackState.h +include/antlr4-runtime/atn/PrecedencePredicateTransition.h +include/antlr4-runtime/atn/PredicateEvalInfo.h +include/antlr4-runtime/atn/PredicateTransition.h +include/antlr4-runtime/atn/PredictionContext.h +include/antlr4-runtime/atn/PredictionContextCache.h +include/antlr4-runtime/atn/PredictionContextMergeCache.h +include/antlr4-runtime/atn/PredictionContextMergeCacheOptions.h +include/antlr4-runtime/atn/PredictionContextType.h +include/antlr4-runtime/atn/PredictionMode.h +include/antlr4-runtime/atn/ProfilingATNSimulator.h +include/antlr4-runtime/atn/RangeTransition.h +include/antlr4-runtime/atn/RuleStartState.h +include/antlr4-runtime/atn/RuleStopState.h +include/antlr4-runtime/atn/RuleTransition.h +include/antlr4-runtime/atn/SemanticContext.h +include/antlr4-runtime/atn/SemanticContextType.h +include/antlr4-runtime/atn/SerializedATNView.h +include/antlr4-runtime/atn/SetTransition.h +include/antlr4-runtime/atn/SingletonPredictionContext.h +include/antlr4-runtime/atn/StarBlockStartState.h +include/antlr4-runtime/atn/StarLoopEntryState.h +include/antlr4-runtime/atn/StarLoopbackState.h +include/antlr4-runtime/atn/TokensStartState.h +include/antlr4-runtime/atn/Transition.h +include/antlr4-runtime/atn/TransitionType.h +include/antlr4-runtime/atn/WildcardTransition.h +include/antlr4-runtime/dfa/DFA.h +include/antlr4-runtime/dfa/DFASerializer.h +include/antlr4-runtime/dfa/DFAState.h +include/antlr4-runtime/dfa/LexerDFASerializer.h +include/antlr4-runtime/internal/Synchronization.h +include/antlr4-runtime/misc/InterpreterDataReader.h +include/antlr4-runtime/misc/Interval.h +include/antlr4-runtime/misc/IntervalSet.h +include/antlr4-runtime/misc/MurmurHash.h +include/antlr4-runtime/misc/Predicate.h +include/antlr4-runtime/support/Any.h +include/antlr4-runtime/support/Arrays.h +include/antlr4-runtime/support/BitSet.h +include/antlr4-runtime/support/CPPUtils.h +include/antlr4-runtime/support/Casts.h +include/antlr4-runtime/support/Declarations.h +include/antlr4-runtime/support/StringUtils.h +include/antlr4-runtime/support/Unicode.h +include/antlr4-runtime/support/Utf8.h +include/antlr4-runtime/tree/AbstractParseTreeVisitor.h +include/antlr4-runtime/tree/ErrorNode.h +include/antlr4-runtime/tree/ErrorNodeImpl.h +include/antlr4-runtime/tree/IterativeParseTreeWalker.h +include/antlr4-runtime/tree/ParseTree.h +include/antlr4-runtime/tree/ParseTreeListener.h +include/antlr4-runtime/tree/ParseTreeProperty.h +include/antlr4-runtime/tree/ParseTreeType.h +include/antlr4-runtime/tree/ParseTreeVisitor.h +include/antlr4-runtime/tree/ParseTreeWalker.h +include/antlr4-runtime/tree/TerminalNode.h +include/antlr4-runtime/tree/TerminalNodeImpl.h +include/antlr4-runtime/tree/Trees.h +include/antlr4-runtime/tree/pattern/Chunk.h +include/antlr4-runtime/tree/pattern/ParseTreeMatch.h +include/antlr4-runtime/tree/pattern/ParseTreePattern.h +include/antlr4-runtime/tree/pattern/ParseTreePatternMatcher.h +include/antlr4-runtime/tree/pattern/RuleTagToken.h +include/antlr4-runtime/tree/pattern/TagChunk.h +include/antlr4-runtime/tree/pattern/TextChunk.h +include/antlr4-runtime/tree/pattern/TokenTagToken.h +include/antlr4-runtime/tree/xpath/XPath.h +include/antlr4-runtime/tree/xpath/XPathElement.h +include/antlr4-runtime/tree/xpath/XPathLexer.h +include/antlr4-runtime/tree/xpath/XPathLexerErrorListener.h +include/antlr4-runtime/tree/xpath/XPathRuleAnywhereElement.h +include/antlr4-runtime/tree/xpath/XPathRuleElement.h +include/antlr4-runtime/tree/xpath/XPathTokenAnywhereElement.h +include/antlr4-runtime/tree/xpath/XPathTokenElement.h +include/antlr4-runtime/tree/xpath/XPathWildcardAnywhereElement.h +include/antlr4-runtime/tree/xpath/XPathWildcardElement.h lib/cmake/Surelog/SurelogConfig.cmake lib/cmake/Surelog/SurelogConfigVersion.cmake lib/cmake/Surelog/SurelogTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Surelog/SurelogTargets.cmake lib/libantlr4-runtime.a +lib/libantlr4-runtime.so +lib/libantlr4-runtime.so.4.13.2 lib/libsurelog.so -lib/libsurelog.so.1.84 -lib/surelog-python/python/slSV3_1aPythonListener.py -lib/surelog-python/python/slformatmsg.py -lib/surelog-python/python/slwaivers.py +lib/libsurelog.so.%%SOVERSION%% +%%PYTHON%%lib/surelog-python/python/slSV3_1aPythonListener.py +%%PYTHON%%lib/surelog-python/python/slformatmsg.py +%%PYTHON%%lib/surelog-python/python/slwaivers.py libdata/pkgconfig/Surelog.pc +share/doc/libantlr4/README.md +share/doc/libantlr4/VERSION diff --git a/cad/uhdm/Makefile b/cad/uhdm/Makefile index a90694445cd8..3ba3a742ad3c 100644 --- a/cad/uhdm/Makefile +++ b/cad/uhdm/Makefile @@ -1,33 +1,35 @@ PORTNAME= uhdm DISTVERSIONPREFIX= v -DISTVERSION= 1.84 +DISTVERSION= 1.86 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org COMMENT= Universal Hardware Data Model WWW= https://github.com/chipsalliance/UHDM LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}orderedmultidict>0:devel/py-orderedmultidict@${PY_FLAVOR} LIB_DEPENDS= libcapnp.so:devel/capnproto TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing compiler:c++17-lang python:build tcl:86,build USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= chipsalliance GH_PROJECT= ${PORTNAME:tu} +CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD} -DPython3_EXECUTABLE=${PYTHON_CMD} CMAKE_ON= BUILD_SHARED_LIBS \ UHDM_USE_HOST_CAPNP \ UHDM_USE_HOST_GTEST CMAKE_OFF= UHDM_BUILD_TESTS -CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD} -DPython3_EXECUTABLE=${PYTHON_CMD} CMAKE_TESTING_ON= UHDM_BUILD_TESTS # tests fail to compile, see https://github.com/chipsalliance/UHDM/issues/1045 BINARY_ALIAS= tclsh=${TCLSH} +PLIST_SUB= SOVERSION=${DISTVERSION} + .include diff --git a/cad/uhdm/distinfo b/cad/uhdm/distinfo index 61d019e62894..c8d0f1f152c4 100644 --- a/cad/uhdm/distinfo +++ b/cad/uhdm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723101718 -SHA256 (chipsalliance-UHDM-v1.84_GH0.tar.gz) = bb2acbdd294dd05660c78ba34704440032935b8bc77cae352c853533b5a7c583 -SIZE (chipsalliance-UHDM-v1.84_GH0.tar.gz) = 1756419 +TIMESTAMP = 1762219339 +SHA256 (chipsalliance-UHDM-v1.86_GH0.tar.gz) = 179203b166be5d1be12b901c69c6a569ebebf4fe47bc674b1268bd9319216fce +SIZE (chipsalliance-UHDM-v1.86_GH0.tar.gz) = 1762968 diff --git a/cad/uhdm/pkg-plist b/cad/uhdm/pkg-plist index 4c8da2af8250..ad001e515458 100644 --- a/cad/uhdm/pkg-plist +++ b/cad/uhdm/pkg-plist @@ -1,310 +1,310 @@ bin/uhdm-cmp bin/uhdm-dump bin/uhdm-hier bin/uhdm-lint include/uhdm/BaseClass.h include/uhdm/ElaboratorListener.h include/uhdm/ExprEval.h include/uhdm/NumUtils.h include/uhdm/RTTI.h include/uhdm/Serializer.h include/uhdm/SymbolFactory.h include/uhdm/SymbolId.h include/uhdm/SynthSubset.h include/uhdm/UhdmAdjuster.h include/uhdm/UhdmLint.h include/uhdm/UhdmListener.h include/uhdm/VpiListener.h include/uhdm/VpiListenerTracer.h include/uhdm/actual_group.h include/uhdm/alias_stmt.h include/uhdm/always.h include/uhdm/any_pattern.h include/uhdm/array_expr.h include/uhdm/array_net.h include/uhdm/array_typespec.h include/uhdm/array_var.h include/uhdm/assert_stmt.h include/uhdm/assertion.h include/uhdm/assign_stmt.h include/uhdm/assignment.h include/uhdm/assume.h include/uhdm/atomic_stmt.h include/uhdm/attribute.h include/uhdm/begin.h include/uhdm/bit_select.h include/uhdm/bit_typespec.h include/uhdm/bit_var.h include/uhdm/break_stmt.h include/uhdm/byte_typespec.h include/uhdm/byte_var.h include/uhdm/case_item.h include/uhdm/case_property.h include/uhdm/case_property_item.h include/uhdm/case_stmt.h include/uhdm/chandle_typespec.h include/uhdm/chandle_var.h include/uhdm/checker_decl.h include/uhdm/checker_inst.h include/uhdm/checker_inst_port.h include/uhdm/checker_port.h include/uhdm/class_defn.h include/uhdm/class_hierarchy.txt include/uhdm/class_obj.h include/uhdm/class_typespec.h include/uhdm/class_var.h include/uhdm/clocked_property.h include/uhdm/clocked_seq.h include/uhdm/clocking_block.h include/uhdm/clocking_io_decl.h include/uhdm/clone_tree.h include/uhdm/concurrent_assertions.h include/uhdm/config.h include/uhdm/constant.h include/uhdm/constr_foreach.h include/uhdm/constr_if.h include/uhdm/constr_if_else.h include/uhdm/constraint.h include/uhdm/constraint_expr.h include/uhdm/constraint_item_group.h include/uhdm/constraint_ordering.h include/uhdm/cont_assign.h include/uhdm/cont_assign_bit.h include/uhdm/containers.h include/uhdm/continue_stmt.h include/uhdm/cover.h include/uhdm/deassign.h include/uhdm/def_param.h include/uhdm/delay_control.h include/uhdm/delay_term.h include/uhdm/design.h include/uhdm/disable.h include/uhdm/disable_fork.h include/uhdm/disables.h include/uhdm/dist_item.h include/uhdm/distribution.h include/uhdm/do_while.h include/uhdm/enum_const.h include/uhdm/enum_net.h include/uhdm/enum_struct_packed_net_group.h include/uhdm/enum_struct_union_packed_array_typespec_group.h include/uhdm/enum_struct_union_packed_var_group.h include/uhdm/enum_typespec.h include/uhdm/enum_var.h include/uhdm/event_control.h include/uhdm/event_stmt.h include/uhdm/event_typespec.h include/uhdm/expect_stmt.h include/uhdm/expr.h include/uhdm/expr_constr_group.h include/uhdm/expr_dist.h include/uhdm/expr_interf_expr_group.h include/uhdm/expr_range_group.h include/uhdm/expr_ref_obj_group.h include/uhdm/expr_sequence_inst_group.h include/uhdm/expr_sequence_inst_named_event_group.h include/uhdm/expr_tchk_term_group.h include/uhdm/expr_typespec_group.h include/uhdm/extends.h include/uhdm/final_stmt.h include/uhdm/for_stmt.h include/uhdm/force.h include/uhdm/foreach_stmt.h include/uhdm/forever_stmt.h include/uhdm/fork_stmt.h include/uhdm/func_call.h include/uhdm/function.h include/uhdm/gate.h include/uhdm/gate_array.h include/uhdm/gen_case.h include/uhdm/gen_for.h include/uhdm/gen_if.h include/uhdm/gen_if_else.h include/uhdm/gen_region.h include/uhdm/gen_scope.h include/uhdm/gen_scope_array.h include/uhdm/gen_stmt.h include/uhdm/gen_var.h include/uhdm/hier_path.h include/uhdm/if_else.h include/uhdm/if_stmt.h include/uhdm/immediate_assert.h include/uhdm/immediate_assume.h include/uhdm/immediate_cover.h include/uhdm/implication.h include/uhdm/import_typespec.h include/uhdm/include_file_info.h include/uhdm/indexed_part_select.h include/uhdm/initial.h include/uhdm/instance.h include/uhdm/instance_array.h include/uhdm/instance_item.h include/uhdm/int_typespec.h include/uhdm/int_var.h include/uhdm/integer_net.h include/uhdm/integer_typespec.h include/uhdm/integer_var.h include/uhdm/interf_prog_mod_group.h include/uhdm/interface_array.h include/uhdm/interface_expr.h include/uhdm/interface_inst.h include/uhdm/interface_tf_decl.h include/uhdm/interface_typespec.h include/uhdm/io_decl.h include/uhdm/let_decl.h include/uhdm/let_expr.h include/uhdm/logic_net.h include/uhdm/logic_typespec.h include/uhdm/logic_var.h include/uhdm/long_int_typespec.h include/uhdm/long_int_var.h include/uhdm/method_func_call.h include/uhdm/method_func_task_call_group.h include/uhdm/method_task_call.h include/uhdm/mod_path.h include/uhdm/modport.h include/uhdm/module_array.h include/uhdm/module_inst.h include/uhdm/module_typespec.h include/uhdm/multiclock_sequence_expr.h include/uhdm/named_begin.h include/uhdm/named_event.h include/uhdm/named_event_array.h include/uhdm/named_event_sequence_expr_group.h include/uhdm/named_fork.h include/uhdm/net.h include/uhdm/net_bit.h include/uhdm/net_drivers.h include/uhdm/net_loads.h include/uhdm/nets.h include/uhdm/nets_vars_ref_obj_group.h include/uhdm/null_stmt.h include/uhdm/operand_group.h include/uhdm/operation.h include/uhdm/ordered_wait.h include/uhdm/package.h include/uhdm/packed_array_net.h include/uhdm/packed_array_typespec.h include/uhdm/packed_array_var.h include/uhdm/param_assign.h include/uhdm/parameter.h include/uhdm/parameters.h include/uhdm/part_select.h include/uhdm/path_term.h include/uhdm/pattern.h include/uhdm/pattern_expr_group.h include/uhdm/port.h include/uhdm/port_bit.h include/uhdm/ports.h include/uhdm/prim_term.h include/uhdm/primitive.h include/uhdm/primitive_array.h include/uhdm/process_stmt.h include/uhdm/program.h include/uhdm/program_array.h include/uhdm/prop_formal_decl.h include/uhdm/property_decl.h include/uhdm/property_expr_group.h include/uhdm/property_expr_named_event_group.h include/uhdm/property_inst.h include/uhdm/property_inst_spec_group.h include/uhdm/property_spec.h include/uhdm/property_typespec.h include/uhdm/range.h include/uhdm/real_typespec.h include/uhdm/real_var.h include/uhdm/ref_module.h include/uhdm/ref_obj.h include/uhdm/ref_obj_interf_net_var_group.h include/uhdm/ref_typespec.h include/uhdm/ref_var.h include/uhdm/reg.h include/uhdm/reg_array.h include/uhdm/release.h include/uhdm/repeat.h include/uhdm/repeat_control.h include/uhdm/restrict.h include/uhdm/return_stmt.h include/uhdm/scope.h include/uhdm/seq_formal_decl.h include/uhdm/sequence_decl.h include/uhdm/sequence_expr_group.h include/uhdm/sequence_expr_multiclock_group.h include/uhdm/sequence_inst.h include/uhdm/sequence_typespec.h include/uhdm/short_int_typespec.h include/uhdm/short_int_var.h include/uhdm/short_real_typespec.h include/uhdm/short_real_var.h include/uhdm/simple_expr.h include/uhdm/simple_expr_use_group.h include/uhdm/soft_disable.h include/uhdm/spec_param.h include/uhdm/stmt.h include/uhdm/string_typespec.h include/uhdm/string_var.h include/uhdm/struct_net.h include/uhdm/struct_pattern.h include/uhdm/struct_typespec.h include/uhdm/struct_var.h include/uhdm/sv_vpi_user.h include/uhdm/switch_array.h include/uhdm/switch_tran.h include/uhdm/sys_func_call.h include/uhdm/sys_func_task_call_group.h include/uhdm/sys_task_call.h include/uhdm/table_entry.h include/uhdm/tagged_pattern.h include/uhdm/task.h include/uhdm/task_call.h include/uhdm/task_func.h include/uhdm/task_func_named_begin_fork_group.h include/uhdm/tchk.h include/uhdm/tchk_term.h include/uhdm/tf_call.h include/uhdm/tf_call_args.h include/uhdm/thread_obj.h include/uhdm/time_net.h include/uhdm/time_typespec.h include/uhdm/time_var.h include/uhdm/type_parameter.h include/uhdm/typespec.h include/uhdm/typespec_member.h include/uhdm/udp.h include/uhdm/udp_array.h include/uhdm/udp_defn.h include/uhdm/uhdm-version.h include/uhdm/uhdm.h include/uhdm/uhdm_forward_decl.h include/uhdm/uhdm_types.h include/uhdm/uhdm_vpi_user.h include/uhdm/union_typespec.h include/uhdm/union_var.h include/uhdm/unsupported_expr.h include/uhdm/unsupported_stmt.h include/uhdm/unsupported_typespec.h include/uhdm/user_systf.h include/uhdm/var_bit.h include/uhdm/var_select.h include/uhdm/variable_drivers_group.h include/uhdm/variable_loads_group.h include/uhdm/variables.h include/uhdm/variables_operation_group.h include/uhdm/vhpi_user.h include/uhdm/virtual_interface_var.h include/uhdm/void_typespec.h include/uhdm/vpi_uhdm.h include/uhdm/vpi_user.h include/uhdm/vpi_visitor.h include/uhdm/wait_fork.h include/uhdm/wait_stmt.h include/uhdm/waits.h include/uhdm/while_stmt.h lib/cmake/UHDM/UHDMConfig.cmake lib/cmake/UHDM/UHDMConfigVersion.cmake lib/cmake/UHDM/UHDMTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/UHDM/UHDMTargets.cmake lib/libuhdm.so -lib/libuhdm.so.1.84 +lib/libuhdm.so.%%SOVERSION%% libdata/pkgconfig/UHDM.pc %%DATADIR%%/UHDM.capnp diff --git a/cad/yosys-systemverilog/Makefile b/cad/yosys-systemverilog/Makefile index a65978527163..f4a5e6e23d2f 100644 --- a/cad/yosys-systemverilog/Makefile +++ b/cad/yosys-systemverilog/Makefile @@ -1,98 +1,98 @@ PORTNAME= yosys-systemverilog DISTVERSION= 2023-06-14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad PKGNAMEPREFIX= MAINTAINER= yuri@FreeBSD.org COMMENT= SystemVerilog support for Yosys WWW= https://github.com/antmicro/yosys-systemverilog LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN= incompatible yet with the latest cad/uhdm, see https://github.com/antmicro/yosys-systemverilog/issues/1845 BUILD_DEPENDS= bash:shells/bash \ yosys>0:cad/yosys LIB_DEPENDS= libcapnp.so:devel/capnproto \ libffi.so:devel/libffi \ libsurelog.so:cad/surelog \ libuhdm.so:cad/uhdm RUN_DEPENDS= yosys>0:cad/yosys USES= cabal gmake pkgconfig python:build readline tcl USE_CABAL= alex-3.3.0.0 \ cmdargs-0.10.22 \ githash-0.1.6.3 \ happy-1.20.1.1 \ hashable-1.4.2.0_1 \ primitive-0.8.0.0 \ th-compat-0.1.4_2 \ vector-0.13.0.0_3 \ vector-stream-0.1.0.0_2 SKIP_CABAL_PLIST= yes # in order to update USE_CABAL run 'make local-cabal-configure local-make-use-cabal' USE_GITHUB= yes GH_ACCOUNT= antmicro GH_TAGNAME= 49069fb-${DISTVERSION} GH_TUPLE= chipsalliance:yosys-f4pga-plugins:56f957c:yosys_f4pga_plugins/yosys-f4pga-plugins \ zachjs:sv2v:6c4ee8f:sv2v/sv2v \ YosysHQ:yosys:c5e4eec:yosys/yosys MAKE_ENV= DESTDIR=${DESTDIR} \ HOME=${WRKSRC} MAKE_ARGS= YOSYS_PATH=${LOCALBASE} -j${MAKE_JOBS_NUMBER} BINARY_ALIAS= python3=${PYTHON_CMD} \ install=${FILESDIR}/install.sh OPTIONS_DEFINE= TCMALLOC OPTIONS_DEFAULT= TCMALLOC # should be the same TCMALLOC default as in cad/yosys, cad/surelog, cad/uhdm because surelog's lib is used in the yosys plugin cad/yosys-systemverilog TCMALLOC_LDFLAGS= `pkg-config --libs libtcmalloc` TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools PORTSCOUT= ignore:1 # until https://github.com/antmicro/yosys-systemverilog/issues/1798 is resolved post-extract: @${CP} ${WRKSRC_yosys}/passes/pmgen/pmgen.py ${WRKSRC}/yosys-f4pga-plugins local-cabal-configure: check-cabal @cd ${WRKSRC}/sv2v && \ ${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --dry-run --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} ${BUILD_ARGS} exe:sv2v local-make-use-cabal: check-cabal2tuple @${_CABAL2TUPLE_CMD} ${CABAL2TUPLE_ARGS} ${WRKSRC}/sv2v || (${ECHO_CMD} "Did you forget to make do-cabal-configure ?" ; exit 1) do-build: # UHDM plugin ${ECHO} "==> Building the C part (yosys-f4pga-plugins)" @cd ${WRKSRC}/yosys-f4pga-plugins && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${ALL_TARGET} # sv2v ${ECHO} "==> Building the Haskell part (sv2v)" cd ${WRKSRC}/sv2v && \ ${LN} -fs ${CABAL_DEPSDIR} && \ ${LN} -fs ../cabal.project.local && \ ${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --offline --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} exe:sv2v do-install: # create directories @${MKDIR} \ ${STAGEDIR}${PREFIX}/share/yosys/plugins/fasm_extra_modules \ ${STAGEDIR}${PREFIX}/share/yosys/quicklogic/pp3 \ ${STAGEDIR}${PREFIX}/share/yosys/quicklogic/qlf_k6n10 \ ${STAGEDIR}${PREFIX}/share/yosys/quicklogic/qlf_k6n10f \ ${STAGEDIR}${PREFIX}/share/yosys/nexus # UHDM plugin cd ${WRKSRC}/yosys-f4pga-plugins && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${INSTALL_TARGET} # sv2v ${INSTALL_PROGRAM} \ ${WRKSRC}/sv2v/dist-newstyle/build/*-freebsd/ghc-*/sv2v-*/x/sv2v/build/sv2v/sv2v \ ${STAGEDIR}${PREFIX}/bin # strip binaries ${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/yosys/plugins/*.so .include