From nobody Mon Oct 6 17:02:08 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 558354503B; Fri, 18 Jul 2025 14:58:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752850700; cv=none; b=b6OvFA1EwQw0fEz8+8tDS5TDrUhMkzYBZhLfh9T4T1N1JxPUPPd86Oud0fdAxkRMMUg6enNBxD0eldDduWN69TUrRP/E8ykTL27guAPIaXRhKjtHS1ZPXXILuCON0BbVHUFKvhu9vcvnQdzFStPtwt4FDeV8zC5ziIz4pojsm1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752850700; c=relaxed/simple; bh=bHqd0pceGXeracf8rTym4kiKPxEE+vjc0WSbnSdUIYg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sd4y5D6qNkFMfNxl8wBELBUOf6ekD0VbP4RC6puf/+5MA5HJzs33whCcSy50JAiracK1LrmJ4l7OKyteQtBWU630Lv6vm5VkHbriMljyGLLTs5tn2lTp2uFtU8nj9o7JSRlC6yiw0jEXAkgJey01YwX6YT7K7/hCZ3D/1qeqL3w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=GsXYNlwh; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=jKSEV8bp; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="GsXYNlwh"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="jKSEV8bp" From: Nam Cao DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1752850697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xQIJao/BEOvnZ/LvbD4mo/zjJjh7HsWT/5/dONy0Yo8=; b=GsXYNlwhn86aYAp5ibZA4S4YEBDfsR7nTRzSajiECDUgVj2Z2nGsdDDM2GdEGBSHnpwxdi 4BJvmz7lHCmfBxvFjCpUXI0a1bvJA7MCU5NqiJzZSKoYlJznbqKTp+QviUrtrj4st2qXVU CrrlRfwS/a/p6xLzLG+WeKLX9fRccGFqZSgB0/nHiElHM0G7bYFWbjlxFUhcq41tO/YWt4 XYPI4e25eT3c3/RP5jXAKORcsULKXJx2nXfLyINtKiMkA08h+xzxwHgiz0q1fd5lI/D08B +4W7Wznoxn+CSadxbdWdJiYYAJtzRgZzzdcZIa5NaDjBDTgCBckiLVJNkNFXpg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1752850697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xQIJao/BEOvnZ/LvbD4mo/zjJjh7HsWT/5/dONy0Yo8=; b=jKSEV8bpkNCM6SD0JZUQcUM1Xtz/TnRCR8gjwOt/9NEwtfs2MFu00uCxaAQFrdNmosOWQv 7rlOng5RAEj4qYAg== To: Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Gabriele Monaco , linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Nam Cao Subject: [PATCH 1/2] verification/rvgen: Generate each variable definition only once Date: Fri, 18 Jul 2025 16:58:10 +0200 Message-Id: <107dcf0d0aa8482d5fbe0314c3138f61cd284e91.1752850449.git.namcao@linutronix.de> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If a variable appears multiple times in the specification, ltl2k generates multiple variable definitions. This fails the build. Make sure each variable is only defined once. Signed-off-by: Nam Cao --- tools/verification/rvgen/rvgen/ltl2k.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/verification/rvgen/rvgen/ltl2k.py b/tools/verification/r= vgen/rvgen/ltl2k.py index 92e713861d86..59da351792ec 100644 --- a/tools/verification/rvgen/rvgen/ltl2k.py +++ b/tools/verification/rvgen/rvgen/ltl2k.py @@ -112,14 +112,16 @@ class ltl2k(generator.Monitor): if node.op.is_temporal(): continue =20 - if isinstance(node.op, ltl2ba.Variable): - buf.append("\tbool %s =3D test_bit(LTL_%s, mon->atoms);" %= (node, node.op.name)) - elif isinstance(node.op, ltl2ba.AndOp): + if isinstance(node.op, ltl2ba.AndOp): buf.append("\tbool %s =3D %s && %s;" % (node, node.op.left= , node.op.right)) elif isinstance(node.op, ltl2ba.OrOp): buf.append("\tbool %s =3D %s || %s;" % (node, node.op.left= , node.op.right)) elif isinstance(node.op, ltl2ba.NotOp): buf.append("\tbool %s =3D !%s;" % (node, node.op.child)) + + for atom in self.atoms: + buf.append("\tbool %s =3D test_bit(LTL_%s, mon->atoms);" % (at= om.lower(), atom)) + buf.reverse() =20 buf2 =3D [] --=20 2.39.5 From nobody Mon Oct 6 17:02:08 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A2651186284; Fri, 18 Jul 2025 14:58:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752850701; cv=none; b=KXugm9Li6kvy1Evmf9M0mS3TY438QsUO9GaZXu1LLBl7oDzAjcsBNOUYFfU2lCIlDhHQbxbKNlaMXcigE6MVgXKQ9xjFRyOnxBgBxWBBPdpPnqxQN/Da/Wioni2LJ1TysCBIZe1nEytDqz+GmDJwn5a1UcWrywXG/niyEVvd9c8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752850701; c=relaxed/simple; bh=xVMfBgl1l3GHsKKQVU8yKnQCBPFluy2E1a7pDYpZ2ok=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KQQ3GjsO23OzwcUudAPxwFer/mAxBdWXCSyEKovINXaeZtgudG1CrSdhpBc94//MtIJIQpa0oEhtaKnlpGTC6etPANFli8qU1MsphaM94XCdOiMeDq2fMwvg6AeNQE+FVZkAIWa4KwuOJcFes0Jn4+sLRA1Dp8aW3X+j3gDUkzY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=P5M6zAxh; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=V7rfwEYr; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="P5M6zAxh"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="V7rfwEYr" From: Nam Cao DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1752850698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OYKTQi7OGOSXX22a4In+1PmPa1DfLGyOjSg+4bTlG50=; b=P5M6zAxhLcfQMlUW3I05OZ+NvjToiLLyfeSlKCsY4Gr4KPOHr6zJzK0wktDKpVjJ67//ns +9MuFPOU/oZhpbNSaEHbQ4Yg/9jJYGmqWM9/KdA/avDNTInn6U2FAXjK5MWukksPA7q5gv gNBJDFp9L1LAO9MT4NtS87KfrrqPsnMMGetsdkYiAra6zTl6UOdrqn+kok/p88NZFWH4l5 uptjOJcvbUqGM0mvMjU35ge+ry7CY83uOjzvLtwyInpk8kbjfoP0F8w82FbPP0pzkhvdRJ jc+/1i65b0ijqhgdnqv1oEFU7vkhFUHAxE5pvRxWtcMx2tkTMfmy3LgX/uy4tQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1752850698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OYKTQi7OGOSXX22a4In+1PmPa1DfLGyOjSg+4bTlG50=; b=V7rfwEYreWuuiv1/eKSw45w4yn+UKBjxr36pto18piKULXM7ErzkFmZfHvUgxocW7MUEFZ e0BRu5heCfvyJyCg== To: Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Gabriele Monaco , linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Nam Cao Subject: [PATCH 2/2] verification/rvgen: Do not generate unused variables Date: Fri, 18 Jul 2025 16:58:11 +0200 Message-Id: <636b2b2d99a9bd46a9f77a078d44ebd7ffc7508c.1752850449.git.namcao@linutronix.de> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ltl2k generates all variable definition in both ltl_start() and ltl_possible_next_states(). However, these two functions may not use all the variables, causing "unused variable" compiler warning. Change the script to only generate used variables. Signed-off-by: Nam Cao Reviewed-by: Gabriele Monaco --- tools/verification/rvgen/rvgen/ltl2k.py | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/tools/verification/rvgen/rvgen/ltl2k.py b/tools/verification/r= vgen/rvgen/ltl2k.py index 59da351792ec..b075f98d50c4 100644 --- a/tools/verification/rvgen/rvgen/ltl2k.py +++ b/tools/verification/rvgen/rvgen/ltl2k.py @@ -106,20 +106,25 @@ class ltl2k(generator.Monitor): ]) return buf =20 - def _fill_atom_values(self): + def _fill_atom_values(self, required_values): buf =3D [] for node in self.ltl: - if node.op.is_temporal(): + if str(node) not in required_values: continue =20 if isinstance(node.op, ltl2ba.AndOp): buf.append("\tbool %s =3D %s && %s;" % (node, node.op.left= , node.op.right)) + required_values |=3D {str(node.op.left), str(node.op.right= )} elif isinstance(node.op, ltl2ba.OrOp): buf.append("\tbool %s =3D %s || %s;" % (node, node.op.left= , node.op.right)) + required_values |=3D {str(node.op.left), str(node.op.right= )} elif isinstance(node.op, ltl2ba.NotOp): buf.append("\tbool %s =3D !%s;" % (node, node.op.child)) + required_values.add(str(node.op.child)) =20 for atom in self.atoms: + if atom.lower() not in required_values: + continue buf.append("\tbool %s =3D test_bit(LTL_%s, mon->atoms);" % (at= om.lower(), atom)) =20 buf.reverse() @@ -135,7 +140,13 @@ class ltl2k(generator.Monitor): "ltl_possible_next_states(struct ltl_monitor *mon, unsigned in= t state, unsigned long *next)", "{" ] - buf.extend(self._fill_atom_values()) + + required_values =3D set() + for node in self.ba: + for o in sorted(node.outgoing): + required_values |=3D o.labels + + buf.extend(self._fill_atom_values(required_values)) buf.extend([ "", "\tswitch (state) {" @@ -166,7 +177,13 @@ class ltl2k(generator.Monitor): "static void ltl_start(struct task_struct *task, struct ltl_mo= nitor *mon)", "{" ] - buf.extend(self._fill_atom_values()) + + required_values =3D set() + for node in self.ba: + if node.init: + required_values |=3D node.labels + + buf.extend(self._fill_atom_values(required_values)) buf.append("") =20 for node in self.ba: --=20 2.39.5