Commit 531b50e0 authored by Gabriele Monaco's avatar Gabriele Monaco
Browse files

verification/rvgen: Adapt dot2k and templates after refactoring da_monitor.h 



Previous changes refactored the da_monitor header file to avoid using
macros. This implies a few changes in how to import and use da_monitor
helpers:

 DECLARE_DA_MON_<TYPE>(name, type) is substituted by
 #define RV_MON_TYPE RV_MON_<TYPE>

Update the rvgen templates to reflect the changes.

Reviewed-by: default avatarNam Cao <namcao@linutronix.de>
Link: https://lore.kernel.org/r/20251126104241.291258-5-gmonaco@redhat.com


Signed-off-by: default avatarGabriele Monaco <gmonaco@redhat.com>
parent e4a1e415

tools/verification/rvgen/rvgen/dot2k.py

+4 −2
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ class dot2k(Monitor, Dot2c): 
                handle = "handle_start_run_event"

            if self.monitor_type == "per_task":

                buff.append("\tstruct task_struct *p = /* XXX: how do I get p? */;");

                buff.append("\tda_%s_%s(p, %s%s);" % (handle, self.name, event, self.enum_suffix));

                buff.append("\tda_%s(p, %s%s);" % (handle, event, self.enum_suffix));

            else:

                buff.append("\tda_%s_%s(%s%s);" % (handle, self.name, event, self.enum_suffix));

                buff.append("\tda_%s(%s%s);" % (handle, event, self.enum_suffix));

            buff.append("}")

            buff.append("")

        return '\n'.join(buff)
@@ -66,6 +66,8 @@ class dot2k(Monitor, Dot2c): 
        buff.append(" *   Documentation/trace/rv/deterministic_automata.rst")

        buff.append(" */")

        buff.append("")

        buff.append("#define MONITOR_NAME %s" % (self.name))

        buff.append("")



        return buff

tools/verification/rvgen/rvgen/templates/dot2k/main.c

+9 −16
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <linux/init.h>

#include <linux/rv.h>

#include <rv/instrumentation.h>

#include <rv/da_monitor.h>



#define MODULE_NAME "%%MODEL_NAME%%"
@@ -20,15 +19,9 @@ 
 * This is the self-generated part of the monitor. Generally, there is no need

 * to touch this section.

 */

#define RV_MON_TYPE RV_MON_%%MONITOR_TYPE%%

#include "%%MODEL_NAME%%.h"



/*

 * Declare the deterministic automata monitor.

 *

 * The rv monitor reference is needed for the monitor declaration.

 */

static struct rv_monitor rv_%%MODEL_NAME%%;

DECLARE_DA_MON_%%MONITOR_TYPE%%(%%MODEL_NAME%%, %%MIN_TYPE%%);

#include <rv/da_monitor.h>



/*

 * This is the instrumentation part of the monitor.
@@ -42,7 +35,7 @@ static int enable_%%MODEL_NAME%%(void) 
{

	int retval;



	retval = da_monitor_init_%%MODEL_NAME%%();

	retval = da_monitor_init();

	if (retval)

		return retval;
@@ -53,33 +46,33 @@ static int enable_%%MODEL_NAME%%(void) 


static void disable_%%MODEL_NAME%%(void)

{

	rv_%%MODEL_NAME%%.enabled = 0;

	rv_this.enabled = 0;



%%TRACEPOINT_DETACH%%



	da_monitor_destroy_%%MODEL_NAME%%();

	da_monitor_destroy();

}



/*

 * This is the monitor register section.

 */

static struct rv_monitor rv_%%MODEL_NAME%% = {

static struct rv_monitor rv_this = {

	.name = "%%MODEL_NAME%%",

	.description = "%%DESCRIPTION%%",

	.enable = enable_%%MODEL_NAME%%,

	.disable = disable_%%MODEL_NAME%%,

	.reset = da_monitor_reset_all_%%MODEL_NAME%%,

	.reset = da_monitor_reset_all,

	.enabled = 0,

};



static int __init register_%%MODEL_NAME%%(void)

{

	return rv_register_monitor(&rv_%%MODEL_NAME%%, %%PARENT%%);

	return rv_register_monitor(&rv_this, %%PARENT%%);

}



static void __exit unregister_%%MODEL_NAME%%(void)

{

	rv_unregister_monitor(&rv_%%MODEL_NAME%%);

	rv_unregister_monitor(&rv_this);

}



module_init(register_%%MODEL_NAME%%);