Merge pull request #5516 from rocallahan/limit-threads

Limit thread usage in tests

kernel/threading.cc

@@ -3,6 +3,20 @@
 
 YOSYS_NAMESPACE_BEGIN
 
+static int init_max_threads()
+{
+	const char *v = getenv("YOSYS_MAX_THREADS");
+	if (v == nullptr)
+		return INT32_MAX;
+	return atoi(v);
+}
+
+static int get_max_threads()
+{
+	static int max_threads = init_max_threads();
+	return max_threads;
+}
+
 void DeferredLogs::flush()
 {
 	for (auto &m : logs)
@@ -12,10 +26,11 @@ void DeferredLogs::flush()
 			YOSYS_NAMESPACE_PREFIX log("%s", m.text.c_str());
 }
 
-int ThreadPool::pool_size(int reserved_cores, int max_threads)
+int ThreadPool::pool_size(int reserved_cores, int max_worker_threads)
 {
 #ifdef YOSYS_ENABLE_THREADS
-	int num_threads = std::min<int>(std::thread::hardware_concurrency() - reserved_cores, max_threads);
+	int available_threads = std::min<int>(std::thread::hardware_concurrency(), get_max_threads());
+	int num_threads = std::min(available_threads - reserved_cores, max_worker_threads);
         return std::max(0, num_threads);
 #else
         return 0;

kernel/threading.h

@@ -127,9 +127,9 @@ class ThreadPool
 public:
 	// Computes the number of worker threads to use.
 	// `reserved_cores` cores are set aside for other threads (e.g. work on the main thread).
-	// `max_threads` --- don't return more workers than this.
+	// `max_worker_threads` --- don't return more workers than this.
 	// The result may be 0.
-	static int pool_size(int reserved_cores, int max_threads);
+	static int pool_size(int reserved_cores, int max_worker_threads);
 
 	// Create a pool of threads running the given closure (parameterized by thread number).
 	// `pool_size` must be the result of a `pool_size()` call.

tests/aiger/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 set -e
 

tests/alumacc/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 set -e
 for x in *.ys; do
   echo "Running $x.."

tests/arch/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 set -e
 

tests/asicworld/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 OPTIND=1
 seed=""    # default to no seed specified

tests/blif/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 set -e
 for x in *.ys; do
   echo "Running $x.."

tests/bram/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 # run this test many times:
 # MAKE="make -j8" time bash -c 'for ((i=0; i<100; i++)); do echo "-- $i --"; bash run-test.sh || exit 1; done'

tests/common-env.sh

@@ -0,0 +1 @@
+export YOSYS_MAX_THREADS=4

tests/cxxrtl/run-test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+source ../common-env.sh
 
 set -ex
 

tests/fmt/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 set -ex
 

tests/fsm/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 # run this test many times:
 # time bash -c 'for ((i=0; i<100; i++)); do echo "-- $i --"; bash run-test.sh || exit 1; done'

tests/functional/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 

tests/gen-tests-makefile.sh

@@ -9,7 +9,7 @@ generate_target() {
 	echo "all: $target_name"
 	echo ".PHONY: $target_name"
 	echo "$target_name:"
-	printf "\t@%s\n" "$test_command"
+	printf "\t@YOSYS_MAX_THREADS=4 %s\n" "$test_command"
 	printf "\t@echo 'Passed %s'\n" "$target_name"
 }
 

tests/hana/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 OPTIND=1
 seed=""    # default to no seed specified

tests/liberty/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 set -eo pipefail
 
 for x in *.lib; do

tests/memfile/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 set -e
 

tests/memlib/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 set -eu
 
 OPTIND=1

tests/memories/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 set -e
 

tests/opt_share/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 # run this test many times:
 # time bash -c 'for ((i=0; i<100; i++)); do echo "-- $i --"; bash run-test.sh || exit 1; done'

tests/peepopt/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 set -e
 for x in *.ys; do
   echo "Running $x.."

tests/proc/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 set -e
 for x in *.ys; do
   echo "Running $x.."

tests/rpc/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 set -e
 for x in *.ys; do
   echo "Running $x.."

tests/select/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 set -e
 for x in *.ys; do
   echo "Running $x.."

tests/share/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 # run this test many times:
 # time bash -c 'for ((i=0; i<100; i++)); do echo "-- $i --"; bash run-test.sh || exit 1; done'

tests/simple/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 OPTIND=1
 seed=""    # default to no seed specified

tests/simple_abc9/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 
 OPTIND=1
 seed=""    # default to no seed specified

tests/svinterfaces/run-test.sh

@@ -1,4 +1,5 @@
 #/bin/bash -e
+source ../common-env.sh
 
 ./runone.sh  svinterface1
 ./runone.sh  svinterface_at_top

tests/xprop/run-test.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+source ../common-env.sh
 set -e
 
 python3 generate.py $@