README.md

@@ -46,13 +46,11 @@
 - ModelSim SE-64 2020.4 (Revision: 2020.10)
 - QuestaSim 64 2021.1 (Revision: 2021.1)
 - Vivado 2021.1
-- [OSS CVC](https://github.com/cambridgehackers/open-src-cvc) (rev. 782c69a)
 
 Время выполнения бенчмарка на блоке 1кБ (чч:мм:сс):
 ```
 | Симулятор             | Build    | Run      |
 +-----------------------+----------+----------+
-| CVC                   | 00:02:22 | 00:51:47 |
 | Icarus Verilog        | 00:00:27 | 19:04:37 |
 | ModelSim              | 00:00:00 | 01:33:14 |
 | QuestaSim             | 00:00:00 | 01:29:38 |
@@ -76,7 +74,6 @@
 ```
 | Симулятор             | Run  |
 +-----------------------+------+
-| CVC                   |   33 |
 | Icarus Verilog        |  738 |
 | ModelSim              |   60 |
 | QuestaSim             |   58 |

source/testbench.sv

@@ -10,6 +10,8 @@ module testbench #(parameter CPU_COUNT = 1024)
     logic [CPU_COUNT-1:0] done_all;
 
     for (genvar ncpu = 0; ncpu < CPU_COUNT; ncpu = ncpu + 1) begin : cpus
+        localparam logic [31:0] MD5IN = ncpu;
+
         logic done;
         logic reset;
         logic [127:0] md5;
@@ -37,7 +39,7 @@ module testbench #(parameter CPU_COUNT = 1024)
             @(posedge clock);
 
             while(!done) @(posedge clock);
-            $display("MD5(0x%x) = %x", ncpu, md5);
+            $display("MD5(0x%x) = %x", MD5IN, md5);
         end
     end
 

test-cvc/.dir-locals.el

@@ -1 +0,0 @@
-((verilog-mode . ((flycheck-verilator-include-path . ("../source")))))

test-cvc/.gitignore

@@ -1,6 +0,0 @@
-top
-picorv32_tcm.sv
-simbench-all.v
-testbench.sv
-top-mod.sv
-verilog.log

test-cvc/__build.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-. ../scripts/sim_vars.sh
-
-rm -rf ./top
-
-# CVC do not have $urandom function
-cp ../source/testbench.sv ./
-patch testbench.sv testbench.patch
-
-# CVC bug with nonblocking assignment to part of vector
-cp ../source/picorv32_tcm.sv ./
-patch picorv32_tcm.sv picorv32_tcm.patch
-
-# CVC does not support setting parameter via command line
-cp ./top.sv ./top-mod.sv
-sed -i -e "s/CPU_COUNT = 1024/CPU_COUNT = $CPU_COUNT/" top-mod.sv
-
-sources=$(cat $FFILE | grep -v "testbench.sv\|picorv32_tcm.sv")
-
-sv2v --top=top -w simbench-all.v top-mod.sv testbench.sv picorv32_tcm.sv $sources
-sed -i '1i `timescale 1ps/1ps' simbench-all.v
-
-cvc64 -o top -O -pipe +large +nospecify simbench-all.v

test-cvc/__run.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-. ../scripts/sim_vars.sh
-
-./top +dlen=$BLOCK_SIZE

test-cvc/picorv32_tcm.patch

@@ -1,18 +0,0 @@
-diff --git a/source/picorv32_tcm.sv b/source/picorv32_tcm.sv
-index 29e4d6c..763adc7 100644
---- a/source/picorv32_tcm.sv
-+++ b/source/picorv32_tcm.sv
-@@ -39,9 +39,12 @@ module picorv32_tcm #(parameter ADDR_WIDTH = 8,
-     assign word_addr = byte_addr[ADDR_WIDTH-1:2];
- 
-     always @(posedge clock) begin
-+        logic [31:0] tmp;
-+        tmp = ram[word_addr];
-         for (int n = 0; n < 4; n += 1)
-           if (write && mem_wstrb[n])
--            ram[word_addr][n*8 +: 8] <= mem_wdata[n*8 +: 8];
-+            tmp[n*8 +: 8] = mem_wdata[n*8 +: 8];
-+        ram[word_addr] <= tmp;
- 
-         mem_rdata <= ram[word_addr];
-     end

test-cvc/shell.nix

@@ -1,4 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-
-with pkgs;
-mkShell { packages = [ gnumake zlib /* haskellPackages.sv2v */ ]; }

test-cvc/testbench.patch

@@ -1,13 +0,0 @@
-diff --git a/source/testbench.sv b/source/testbench.sv
-index 1872eed..6f27f84 100644
---- a/source/testbench.sv
-+++ b/source/testbench.sv
-@@ -32,7 +32,7 @@ module testbench #(parameter CPU_COUNT = 1024)
- 
-         initial begin
-             reset = 1'b1;
--            repeat($urandom % 5 + 2) @(posedge clock);
-+            repeat($unsigned($random) % 5 + 2) @(posedge clock);
-             reset = 1'b0;
-             @(posedge clock);
- 

test-cvc/top.sv

@@ -1,7 +0,0 @@
-`timescale 1ps/1ps
-
-module top #(parameter CPU_COUNT = 1024);
-    logic clock = 1'b0;
-    initial forever #5000 clock = ~clock;
-    testbench #(CPU_COUNT) testbench (clock);
-endmodule