github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-05 12:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Unix::Processors dependency

Browse Source
This commit is contained in:
Wilson Snyder 2020-12-23 16:07:14 -05:00
parent 575539996b
commit b8b9170f9d
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/ci-install.bash
View File

@ -55,7 +55,7 @@ if [ "$CI_BUILD_STAGE_NAME" = "build" ]; then
sudo apt-get install libsystemc libsystemc-dev sudo apt-get install libsystemc libsystemc-dev
fi fi
if [ "$COVERAGE" = 1 ]; then if [ "$COVERAGE" = 1 ]; then
yes yes | sudo cpan -fi Unix::Processors Parallel::Forker yes yes | sudo cpan -fi Parallel::Forker
fi fi
if [ "$M32" = 1 ]; then if [ "$M32" = 1 ]; then
sudo apt-get install gcc-multilib g++-multilib sudo apt-get install gcc-multilib g++-multilib
@ -100,7 +100,7 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then
if [ "$CI_RUNS_ON" != "ubuntu-14.04" ]; then if [ "$CI_RUNS_ON" != "ubuntu-14.04" ]; then
CI_CPAN_REPO=https://cpan.org CI_CPAN_REPO=https://cpan.org
fi fi
yes yes | sudo cpan -M $CI_CPAN_REPO -fi Unix::Processors Parallel::Forker yes yes | sudo cpan -M $CI_CPAN_REPO -fi Parallel::Forker
install-vcddiff install-vcddiff
autoconf autoconf

2
ci/docker/buildenv/Dockerfile
View File

@ -40,7 +40,7 @@ RUN apt-get update \
WORKDIR /tmp WORKDIR /tmp
RUN cpan install -fi Unix::Processors Parallel::Forker RUN cpan install -fi Parallel::Forker
RUN git clone https://github.com/veripool/vcddiff.git && \ RUN git clone https://github.com/veripool/vcddiff.git && \
make -C vcddiff && \ make -C vcddiff && \

1
docs/install.adoc
View File

@ -100,7 +100,6 @@ Those developing Verilator itself may also want these (see internals.adoc):
sudo apt-get install gdb asciidoctor graphviz cmake clang clang-format gprof lcov sudo apt-get install gdb asciidoctor graphviz cmake clang clang-format gprof lcov
cpan install Pod::Perldoc cpan install Pod::Perldoc
cpan install Unix::Processors
cpan install Parallel::Forker cpan install Parallel::Forker
==== Install SystemC ==== Install SystemC

2
docs/internals.adoc
View File

@ -697,7 +697,7 @@ Verilator problem.
When enabling the long tests, some additional PERL modules are needed, When enabling the long tests, some additional PERL modules are needed,
which you can install using cpan. which you can install using cpan.
cpan install Unix::Processors cpan install Parallel::Forker
There are some traps to avoid when running regression tests There are some traps to avoid when running regression tests

15
test_regress/driver.pl
View File

@ -249,12 +249,17 @@ sub parameter {
} }
} }
our $_Max_Procs;
sub max_procs { sub max_procs {
my $ok = eval " if (!defined $_Max_Procs) {
use Unix::Processors; $_Max_Procs = `python3 -c 'import multiprocessing\nprint(multiprocessing.cpu_count())'`;
return Unix::Processors->new->max_online; chomp $_Max_Procs;
"; if ($_Max_Procs < 2) {
return $ok; $_Max_Procs = 2;
warn "driver.pl: Python didn't find at least two CPUs\n";
}
}
return $_Max_Procs;
} }
sub calc_threads { sub calc_threads {