Merge branch 'chipsalliance:master' into master

.github/workflows/comment-pr.yml

@@ -19,29 +19,10 @@ jobs:
         run: |
           apt-get update -qq
           apt install -y unzip
-      - name: Download artifacts
-        id: get-artifacts
-        uses: actions/[email protected]
-        with:
-          script: |
-            var artifacts = await github.actions.listWorkflowRunArtifacts({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               run_id: ${{ github.event.workflow_run.id }},
-            });
-            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
-              return artifact.name == "tests_summary"
-            })[0];
-            var download = await github.actions.downloadArtifact({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               artifact_id: matchArtifact.id,
-               archive_format: 'zip',
-            });
 
-            console.log("::set-output name=artifact_id::" + matchArtifact.id);
-            var fs = require('fs');
-            fs.writeFileSync('${{github.workspace}}/tests_summary.zip', Buffer.from(download.data));
+      - uses: actions/download-artifact@v4
+        with:
+          name: tests_summary
 
       - name: Unpack artifacts
         run: |
@@ -50,9 +31,8 @@ jobs:
 
       - name: Generate and append artifacts link
         run: |
-          ARTIFACT_ID=${{ steps.get-artifacts.outputs.artifact_id}}
           SUITE_ID=$(cat ./suite_id)
-          ARTIFACT_URL="https://github.com/chipsalliance/sv-tests/suites/$SUITE_ID/artifacts/$ARTIFACT_ID"
+          ARTIFACT_URL="https://github.com/chipsalliance/sv-tests/suites/$SUITE_ID"
           MD_URL="[Download an archive containing all the details]($ARTIFACT_URL)"
           echo -e "\n\n$MD_URL" >> tests_summary.md
 

.github/workflows/lint-review.yml

@@ -1,38 +1,16 @@
 name: lint-review
 on:
-  workflow_run:
-    workflows: ["trigger-lint"]
-    types:
-      - completed
+  pull_request:
 
 jobs:
   lint_review:
     runs-on: ubuntu-latest
+    permissions:
+      checks: write
+      contents: read
+      pull-requests: write
     steps:
       - uses: actions/checkout@v2
-      - name: 'Download artifact'
-        id: get-artifacts
-        uses: actions/[email protected]
-        with:
-          script: |
-            var artifacts = await github.actions.listWorkflowRunArtifacts({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               run_id: ${{github.event.workflow_run.id }},
-            });
-            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
-              return artifact.name == "event.json"
-            })[0];
-            var download = await github.actions.downloadArtifact({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               artifact_id: matchArtifact.id,
-               archive_format: 'zip',
-            });
-            var fs = require('fs');
-            fs.writeFileSync('${{github.workspace}}/event.json.zip', Buffer.from(download.data));
-      - run: |
-          unzip event.json.zip
       - name: Run Verible action
         uses: chipsalliance/verible-linter-action@main
         with:

.github/workflows/sv-tests-ci.yml

@@ -30,6 +30,8 @@ jobs:
           - name: sv-parser
             deps: cargo
             rust_ver: "1.74"
+          - name: tree-sitter-systemverilog
+            deps: gcc
           - name: tree-sitter-verilog
             deps: npm
           - name: verible
@@ -176,7 +178,7 @@ jobs:
       - name: Pack results
         run: |
           tar -cvf out_${{ matrix.tool.name }}.tar ./out/report/${{ matrix.tool.name }}_report.csv ./out/logs/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: report_${{ matrix.tool.name }}
           path: |
@@ -212,7 +214,7 @@ jobs:
       - name: Prepare output directories
         run: |
           mkdir -p out/report
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
           path: ./out/
       - name: Extract
@@ -257,7 +259,7 @@ jobs:
           cat $CHANGES_SUMMARY_MD > $GITHUB_STEP_SUMMARY
 
       - name: Upload artifacts for summary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: github.event_name == 'pull_request'
         with:
           name: tests_summary
@@ -276,7 +278,7 @@ jobs:
           echo $artifacts
       - name: Delete Old Artifacts
         if: github.event_name == 'pull_request'
-        uses: geekyeggo/delete-artifact@v1
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: ${{ steps.get-artifacts-to-delete.outputs.artifacts }}
   Automerge:

.gitmodules

@@ -34,6 +34,9 @@
 [submodule "third_party/tools/tree-sitter-verilog"]
 	path = third_party/tools/tree-sitter-verilog
 	url = https://github.com/tree-sitter/tree-sitter-verilog
+[submodule "third_party/tools/tree-sitter-systemverilog"]
+	path = third_party/tools/tree-sitter-systemverilog
+	url = https://github.com/gmlarumbe/tree-sitter-systemverilog
 [submodule "third_party/cores/fx68k"]
 	path = third_party/cores/fx68k
 	url = https://github.com/ijor/fx68k

README.md

@@ -102,6 +102,7 @@ Finally the file containing the test case and metadata should be placed in `test
 * [Icarus](http://iverilog.icarus.com)
 * [slang](https://github.com/MikePopoloski/slang)
 * [sv2v(zachjs)](https://github.com/zachjs/sv2v)
+* [tree-sitter-systemverilog](https://github.com/gmlarumbe/tree-sitter-systemverilog)
 * [tree-sitter-verilog](https://github.com/tree-sitter/tree-sitter-verilog)
 * [sv-parser](https://github.com/dalance/sv-parser)
 * [moore](http://llhd.io)

conf/generators/meta-path/hdlconvertor_std2017.json

@@ -18,6 +18,7 @@
 		"p188_3.sv",
 		"p191.sv",
 		"p196_2.sv",
+		"p197.sv",
 		"p201.sv",
 		"p220.sv",
 		"p221.sv",

conf/requirements.txt

@@ -9,6 +9,7 @@ make_var
 markupsafe
 pytablewriter
 GitPython
+simplesat==0.8.2
 git+https://github.com/lowRISC/edalize.git@ot
 git+https://github.com/lowRISC/fusesoc.git@ot
 orderedmultidict

generators/ivtest

@@ -279,6 +279,8 @@ ivtest_file_exclude = [
     'pr1698659',
     'pr2076425',
     'shellho1',
+    # needs data text file that this test harness doesn't enable finding
+    'pr2800985a',
     # primitive table rows are invalid, fails on multiple commercial tools
     "pr3587570",
 ]

tests/chapter-11/11.4.12--concat_op-bit_select.sv

@@ -0,0 +1,26 @@
+// Copyright (C) 2019-2021  The SymbiFlow Authors.
+//
+// Use of this source code is governed by a ISC-style
+// license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/ISC
+//
+// SPDX-License-Identifier: ISC
+
+
+/*
+:name: concat_op-bit_select
+:description: concatenation operator w/ bit selection test
+:tags: 11.4.12
+*/
+module top();
+
+  bit [3:0] a;
+
+  bit [7:0] b = 8'b10101100;
+  bit [7:0] c = 8'b01010011;
+
+  initial begin
+	a = {b, c}[9:6];
+  end
+
+endmodule

tools/runners.mk

@@ -80,6 +80,15 @@ $(INSTALL_DIR)/lib/tree-sitter-verilog.so:
 	cd $(RDIR)/tree-sitter-verilog && npm install
 	/usr/bin/env python3 -c "from tree_sitter import Language; Language.build_library(\"$@\", [\"$(abspath $(RDIR)/tree-sitter-verilog)\"])"
 
+# tree-sitter-systemverilog
+tree-sitter-systemverilog: $(INSTALL_DIR)/lib/tree-sitter-systemverilog.so
+
+$(INSTALL_DIR)/lib/tree-sitter-systemverilog.so:
+	mkdir -p $(INSTALL_DIR)/lib
+	cd $(RDIR)/tree-sitter-systemverilog && \
+		cc -fPIC -c -I. src/parser.c && \
+		cc -fPIC -shared *.o -o $@
+
 # surelog-uhdm-verilator
 verilator-uhdm: $(INSTALL_DIR)/bin/verilator-uhdm
 
@@ -173,6 +182,6 @@ $(INSTALL_DIR)/bin/circt-verilog:
 	ninja && ninja install
 
 # setup the dependencies
-RUNNERS_TARGETS := odin yosys icarus verilator slang zachjs-sv2v tree-sitter-verilog sv-parser moore verible surelog yosys-synlig verilator-uhdm circt-verilog
+RUNNERS_TARGETS := odin yosys icarus verilator slang zachjs-sv2v tree-sitter-systemverilog tree-sitter-verilog sv-parser moore verible surelog yosys-synlig verilator-uhdm circt-verilog
 .PHONY: $(RUNNERS_TARGETS)
 runners: $(RUNNERS_TARGETS)

tools/runners/tree_sitter_systemverilog.py

@@ -0,0 +1,103 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2020 The SymbiFlow Authors.
+#
+# Use of this source code is governed by a ISC-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/ISC
+#
+# SPDX-License-Identifier: ISC
+
+import os
+import sys
+import resource
+
+from tree_sitter import Language, Parser
+from BaseRunner import BaseRunner
+
+
+class tree_sitter_systemverilog(BaseRunner):
+    libname = 'tree-sitter-systemverilog.so'
+    locpath = ['runners', 'lib', libname]
+    conpath = ['lib', libname]
+
+    def __init__(self):
+        super().__init__("tree-sitter-systemverilog", None, {"parsing"})
+
+        self.submodule = "third_party/tools/tree-sitter-systemverilog"
+        self.url = f"https://github.com/gmlarumbe/tree-sitter-systemverilog/tree/{self.get_commit()}"
+
+    def find_lib(self):
+        local_lib = ''
+        conda_lib = ''
+        try:
+            out = os.environ['OUT_DIR']
+            local_lib = os.path.abspath(os.path.join(out, *self.locpath))
+        except KeyError:
+            pass
+
+        try:
+            prefix = os.environ['CONDA_PREFIX']
+            conda_lib = os.path.abspath(os.path.join(prefix, *self.conpath))
+        except KeyError:
+            pass
+
+        return local_lib if os.path.isfile(local_lib) else conda_lib
+
+    def log_error(self, fname, row, col, err):
+        self.log += '{}:{}:{}: error: {}\n'.format(fname, row, col, err)
+
+    def walk(self, node, fname):
+        if not node.has_error:
+            return False
+
+        last_err = True
+
+        for child in node.children:
+            if self.walk(child, fname):
+                last_err = False
+
+        if last_err:
+            self.log_error(fname, *node.start_point, 'node type: ' + node.type)
+
+        return True
+
+    def run(self, tmp_dir, params):
+        self.ret = 0
+        self.log = ''
+
+        try:
+            lib = self.find_lib()
+
+            lang = Language(lib, 'verilog')
+
+            parser = Parser()
+            parser.set_language(lang)
+        except Exception as e:
+            self.log += f'{e}\n'
+            self.ret = 1
+
+        for src in params['files']:
+            f = None
+            try:
+                f = open(src, 'rb')
+            except IOError:
+                self.ret = 1
+                self.log_error(src, '', '', 'failed to open file')
+                continue
+
+            try:
+                tree = parser.parse(f.read())
+                if self.walk(tree.root_node, src):
+                    self.ret = 1
+            except Exception as e:
+                self.log_error(src, '', '', 'unknown error: ' + str(e))
+                self.ret = 1
+        usage = resource.getrusage(resource.RUSAGE_SELF)
+        profiling_data = (usage.ru_utime, usage.ru_stime, usage.ru_maxrss)
+
+        return (self.log, self.ret) + profiling_data
+
+    def can_run(self):
+        return os.path.isfile(self.find_lib())