From nobody Thu Dec 18 15:07:24 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 E4D1F267712; Wed, 23 Apr 2025 06:50:42 +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=1745391044; cv=none; b=PR1+DRU/mFmn7s9Psc8PvMd3RguBx2R5GZTI17FI5pvHC2lkWfMw1xAZk6UtmomTZGzlCxDrC/SvIkCVKHHKyf7jArVCqYJPmeauelXTLzZwnD345schRgVT3Lx4CJAchWSGnr9RX3ttT7lr5h06bBhUy3P9nkJTyJQk4q2wLnk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745391044; c=relaxed/simple; bh=1tyueKVzM1VJ1WDma6WPKB1nQNEG95uHkefHtTlXLuY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KNKYTJgHBtmNo/fo5WOiyMXQ7+4L/Wz+z0Et4xHOLn26rpNFTgbkpv2rGkzIAHNhJVMN4K7n1l0lCX4zDyUtCK31ID8JdB/ksWcNTYjTJAZgKulreHCCoDJlDL8HvK4+ntUnWnNajHAMhXezsN87WiitxAxlVqFRsILiYVn4hoc= 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=bMiouVma; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=VWpkGGJ/; 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="bMiouVma"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="VWpkGGJ/" From: Nam Cao DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1745391033; 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=quxmvFOpWEdlDXGAnbEr+RnyianRn/nmBROLE3F3T+I=; b=bMiouVmaztdin0p+aAGKzKmJGgnIPtuCoKGm23CEiGiKileY66QCDSKp40/ZYUGGwIJbO9 smAeNmSY9n5D2a7xG9ET9Y05WsWlWa/MwVj0UOF36A8bNWMkMmEPi7H+2S9FZouJdfuc3A QJVd+N4VkJlnqeLYAL3hGPQgAG2ShY7AV2fZKBSihjHgx99SdYoJctLDJ8EbOnJ6zZAl0S eWMTiixfrvvTgJwu5TDMYfi1wGx2WaEwhDVUfyliQSPJ/B9BhoZ+gMBcSpnKhXmxW3GNl8 eTkmPzjPnSs9U57udZlnkhniS+0FDompcyCHfGjPFok/X17EGbvefJ9E9l6XqQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1745391033; 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=quxmvFOpWEdlDXGAnbEr+RnyianRn/nmBROLE3F3T+I=; b=VWpkGGJ/oCAFGJM2YP+axxCCIQGp4tnY5rTC8nCzFsX3qJ5RGS7/8EpCRoHmSBP8gbXFFz ISm6QSzDOBK7E3CQ== To: Steven Rostedt , Gabriele Monaco , linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: john.ogness@linutronix.de, Nam Cao Subject: [PATCH v4 05/22] verification/dot2k: Make a separate dot2k_templates/Kconfig_container Date: Wed, 23 Apr 2025 08:50:00 +0200 Message-Id: <2d4834c620529ddfa08efe7e09d8bb0f00fd4c58.1745390829.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" A generated container's Kconfig has an incorrect line: select DA_MON_EVENTS_IMPLICIT This is due to container generation uses the same template Kconfig file as deterministic automaton monitor. Therefore, make a separate Kconfig template for container which has only the necessaries for container. Reviewed-by: Gabriele Monaco Signed-off-by: Nam Cao --- Alternatively, we could also modify the Python scripts. I tried both and this solution seems cleaner. --- tools/verification/dot2/dot2k.py | 3 ++- tools/verification/dot2/dot2k_templates/Kconfig_container | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 tools/verification/dot2/dot2k_templates/Kconfig_contain= er diff --git a/tools/verification/dot2/dot2k.py b/tools/verification/dot2/dot= 2k.py index 745d35a4a379..dd4b5528a4f2 100644 --- a/tools/verification/dot2/dot2k.py +++ b/tools/verification/dot2/dot2k.py @@ -35,6 +35,7 @@ class dot2k(Dot2c): self.states =3D [] self.main_c =3D self.__read_file(self.monitor_templates_dir + = "main_container.c") self.main_h =3D self.__read_file(self.monitor_templates_dir + = "main_container.h") + self.kconfig =3D self.__read_file(self.monitor_templates_dir += "Kconfig_container") else: super().__init__(file_path, extra_params.get("model_name")) =20 @@ -44,7 +45,7 @@ class dot2k(Dot2c): self.monitor_type =3D MonitorType self.main_c =3D self.__read_file(self.monitor_templates_dir + = "main.c") self.trace_h =3D self.__read_file(self.monitor_templates_dir += "trace.h") - self.kconfig =3D self.__read_file(self.monitor_templates_dir + "Kc= onfig") + self.kconfig =3D self.__read_file(self.monitor_templates_dir += "Kconfig") self.enum_suffix =3D "_%s" % self.name self.description =3D extra_params.get("description", self.name) or= "auto-generated" self.auto_patch =3D extra_params.get("auto_patch") diff --git a/tools/verification/dot2/dot2k_templates/Kconfig_container b/to= ols/verification/dot2/dot2k_templates/Kconfig_container new file mode 100644 index 000000000000..a606111949c2 --- /dev/null +++ b/tools/verification/dot2/dot2k_templates/Kconfig_container @@ -0,0 +1,5 @@ +config RV_MON_%%MODEL_NAME_UP%% + depends on RV + bool "%%MODEL_NAME%% monitor" + help + %%DESCRIPTION%% --=20 2.39.5