linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Luis R. Rodriguez" <mcgrof@kernel.org>
To: Julia.Lawall@lip6.fr, Gilles.Muller@lip6.fr,
	nicolas.palix@imag.fr, mmarek@suse.com
Cc: linux-kernel@vger.kernel.org, cocci@systeme.lip6.fr,
	"Luis R. Rodriguez" <mcgrof@kernel.org>
Subject: [PATCH 2/4] coccicheck: enable paramap support
Date: Fri, 10 Jun 2016 13:42:10 -0700	[thread overview]
Message-ID: <1465591332-31113-3-git-send-email-mcgrof@kernel.org> (raw)
In-Reply-To: <1465591332-31113-1-git-send-email-mcgrof@kernel.org>

Coccinelle has had paramap support since 1.0.2, this means
it supports --jobs, enabling built-in multithreaded functionality,
instead of needing one to script it out. Just look for --jobs
in the help output to determine if this is supported.

Also enable the load balancing to be dynamic, so that if a
thread finishes early we keep feeding it.

If --jobs is not supported we fallback to the old mechanism.

As a small example, prior to this change, on an 8-core system:

Before:

$ export COCCI=scripts/coccinelle/free/kfree.cocci
$ time make coccicheck MODE=report
...

real    29m14.912s
user    103m1.796s
sys     0m4.464s

After:

real    16m22.435s
user    128m30.060s
sys     0m2.712s

Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
 scripts/coccicheck | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/scripts/coccicheck b/scripts/coccicheck
index aa5e78fba270..eeb5fdc142ca 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -12,8 +12,8 @@ if [ ! -x "$SPATCH" ]; then
     exit 1
 fi
 
-trap kill_running SIGTERM SIGINT
-declare -a SPATCH_PID
+USE_JOBS="no"
+$SPATCH --help | grep "\-\-jobs" > /dev/null && USE_JOBS="yes"
 
 # The verbosity may be set by the environmental parameter V=
 # as for example with 'make V=1 coccicheck'
@@ -82,7 +82,21 @@ if [ "$ONLINE" = "0" ] ; then
     echo ''
 fi
 
-run_cmd() {
+if [ "$USE_JOBS" = "no" ]; then
+	trap kill_running SIGTERM SIGINT
+	declare -a SPATCH_PID
+else
+	OPTIONS="$OPTIONS --jobs $NPROC --chunksize 1"
+fi
+
+run_cmd_paramap() {
+	if [ $VERBOSE -ne 0 ] ; then
+		echo "Running ($NPROC in parallel): $@"
+	fi
+	$@
+}
+
+run_cmd_old() {
 	local i
 	if [ $VERBOSE -ne 0 ] ; then
 		echo "Running ($NPROC in parallel): $@"
@@ -97,6 +111,14 @@ run_cmd() {
 	wait
 }
 
+run_cmd() {
+	if [ "$USE_JOBS" = "yes" ]; then
+		run_cmd_paramap $@
+	else
+		run_cmd_old $@
+	fi
+}
+
 kill_running() {
 	for i in $(seq 0 $(( NPROC - 1 )) ); do
 		if [ $VERBOSE -eq 2 ] ; then
-- 
2.8.2

  parent reply	other threads:[~2016-06-10 20:42 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-10 20:42 [PATCH 0/4] scripts/coccicheck: add paramap and indexing options Luis R. Rodriguez
2016-06-10 20:42 ` [PATCH 1/4] coccicheck: move spatch binary check up Luis R. Rodriguez
2016-06-10 20:42 ` Luis R. Rodriguez [this message]
2016-06-11  5:45   ` [Cocci] [PATCH 2/4] coccicheck: enable paramap support SF Markus Elfring
2016-06-11  5:55     ` Julia Lawall
2016-06-10 20:42 ` [PATCH 3/4] scripts: add glimpse.sh for indexing the kernel Luis R. Rodriguez
2016-06-11 17:09   ` [Cocci] " SF Markus Elfring
2016-06-10 20:42 ` [PATCH 4/4] coccicheck: add indexing enhancement options Luis R. Rodriguez
2016-06-10 21:02   ` Julia Lawall
2016-06-10 21:18     ` Luis R. Rodriguez
2016-06-10 21:21       ` Julia Lawall
2016-06-10 21:43         ` [Cocci] " Wolfram Sang
2016-06-10 21:49           ` Luis R. Rodriguez
2016-06-10 21:51             ` Wolfram Sang
2016-06-10 22:08               ` Luis R. Rodriguez
2016-06-10 22:25                 ` Luis R. Rodriguez
2016-06-11  5:46                   ` Wolfram Sang
2016-06-11  5:54                     ` Julia Lawall
2016-06-11  6:09                       ` Wolfram Sang
2016-06-13 18:37                       ` Luis R. Rodriguez
2016-06-13 18:55                         ` Wolfram Sang
2016-06-13 19:48                           ` Julia Lawall
2016-06-13 21:22                             ` Luis R. Rodriguez
2016-06-14  5:08                               ` Julia Lawall
2016-06-11  5:18                 ` Julia Lawall
2016-06-11  5:58                   ` Wolfram Sang
2016-06-11  6:05                     ` Julia Lawall
2016-06-11  5:24               ` Julia Lawall
2016-06-13 18:39                 ` Luis R. Rodriguez
2016-06-11  5:17             ` Julia Lawall
2016-06-13 19:35         ` Luis R. Rodriguez
2016-06-13 19:50           ` Julia Lawall
2016-06-13 21:28             ` Luis R. Rodriguez
2016-06-14  5:22               ` Julia Lawall
2016-06-14 19:27                 ` Luis R. Rodriguez
2016-06-14 20:47                   ` Julia Lawall
2016-06-14 21:10                     ` Luis R. Rodriguez
2016-06-14 21:17                       ` Julia Lawall
2016-06-14 22:02                         ` Luis R. Rodriguez
2016-06-15  7:39                           ` Julia Lawall
2016-06-15 15:36                             ` Luis R. Rodriguez
2016-06-15 15:44                               ` Julia Lawall
2016-06-15 17:53                                 ` Luis R. Rodriguez
2016-06-11  5:55   ` [Cocci] " SF Markus Elfring
2016-06-11  5:27 ` [Cocci] [PATCH 0/4] scripts/coccicheck: add paramap and indexing options SF Markus Elfring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1465591332-31113-3-git-send-email-mcgrof@kernel.org \
    --to=mcgrof@kernel.org \
    --cc=Gilles.Muller@lip6.fr \
    --cc=Julia.Lawall@lip6.fr \
    --cc=cocci@systeme.lip6.fr \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mmarek@suse.com \
    --cc=nicolas.palix@imag.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).