Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01235041 authored by Prarit Bhargava's avatar Prarit Bhargava Committed by Len Brown
Browse files

tools/power turbostat: Add Node in output 



Output a Node column if there is more than one node/socket.

Signed-off-by: default avatarPrarit Bhargava <prarit@redhat.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 40f5cfe7

tools/power/x86/turbostat/turbostat.c

+16 −0
Original line number Diff line number Diff line
@@ -485,6 +485,7 @@ struct msr_counter bic[] = { 
#define	BIC_Any_c0	(1ULL << 42)

#define	BIC_GFX_c0	(1ULL << 43)

#define	BIC_CPUGFX	(1ULL << 44)

#define	BIC_Node	(1ULL << 45)



#define BIC_DISABLED_BY_DEFAULT	(BIC_USEC | BIC_TOD)
@@ -594,6 +595,8 @@ void print_header(char *delim) 
		outp += sprintf(outp, "%sTime_Of_Day_Seconds", (printed++ ? delim : ""));

	if (DO_BIC(BIC_Package))

		outp += sprintf(outp, "%sPackage", (printed++ ? delim : ""));

	if (DO_BIC(BIC_Node))

		outp += sprintf(outp, "%sNode", (printed++ ? delim : ""));

	if (DO_BIC(BIC_Core))

		outp += sprintf(outp, "%sCore", (printed++ ? delim : ""));

	if (DO_BIC(BIC_CPU))
@@ -871,6 +874,8 @@ int format_counters(struct thread_data *t, struct core_data *c, 
	if (t == &average.threads) {

		if (DO_BIC(BIC_Package))

			outp += sprintf(outp, "%s-", (printed++ ? delim : ""));

		if (DO_BIC(BIC_Node))

			outp += sprintf(outp, "%s-", (printed++ ? delim : ""));

		if (DO_BIC(BIC_Core))

			outp += sprintf(outp, "%s-", (printed++ ? delim : ""));

		if (DO_BIC(BIC_CPU))
@@ -882,6 +887,15 @@ int format_counters(struct thread_data *t, struct core_data *c, 
			else

				outp += sprintf(outp, "%s-", (printed++ ? delim : ""));

		}

		if (DO_BIC(BIC_Node)) {

			if (t)

				outp += sprintf(outp, "%s%d",

						(printed++ ? delim : ""),

					      cpus[t->cpu_id].physical_node_id);

			else

				outp += sprintf(outp, "%s-",

						(printed++ ? delim : ""));

		}

		if (DO_BIC(BIC_Core)) {

			if (c)

				outp += sprintf(outp, "%s%d", (printed++ ? delim : ""), c->core_id);
@@ -4770,6 +4784,8 @@ void topology_probe() 
	set_node_data();

	if (debug > 1)

		fprintf(outf, "nodes_per_pkg %d\n", topo.nodes_per_pkg);

	if (!summary_only && topo.nodes_per_pkg > 1)

		BIC_PRESENT(BIC_Node);



	topo.threads_per_core = max_siblings;

	if (debug > 1)