perf/x86/intel/uncore: Remove extra double quote mark
Subsystems (2)
PATCH 1/1 perf/x86/intel/uncore: Remove extra double quote mark
The third argument in INTEL_UNCORE_FR_EVENT_DESC() is subject to __stringify(), and the extra double quote marks can result in the expansion "3.814697266e-6" in the sysfs knobs, instead of 3.814697266e-6.
This is incorrect, though it may still work for perf, e.g. perf stat -e uncore_iio_free_running_0/bw_in_port0/
--- arch/x86/events/intel/uncore_snbep.c | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-)
arch/x86/events/intel/uncore_snbep.c +24 -24
@@ -6909,34 +6909,34 @@ static struct freerunning_counters dmr_iio_freerunning[] = {static struct uncore_event_desc dmr_uncore_iio_freerunning_events[] = {/* ITC Free Running Data BW counter for inbound traffic */ -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port0,0x10 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port1,0x11 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port2,0x12 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port3,0x13 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port4,0x14 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port5,0x15 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port6,0x16 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port7,0x17 ,"3.814697266e-6" ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port0,0x10 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port1,0x11 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port2,0x12 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port3,0x13 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port4,0x14 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port5,0x15 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port6,0x16 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port7,0x17 ,3.814697266e-6 ),/* ITC Free Running BW IN counters */ -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port0,0x20 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port1,0x21 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port2,0x22 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port3,0x23 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port4,0x24 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port5,0x25 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port6,0x26 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port7,0x27 ,"3.814697266e-6" ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port0,0x20 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port1,0x21 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port2,0x22 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port3,0x23 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port4,0x24 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port5,0x25 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port6,0x26 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port7,0x27 ,3.814697266e-6 ),/* ITC Free Running BW OUT counters */ -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port0,0x30 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port1,0x31 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port2,0x32 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port3,0x33 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port4,0x34 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port5,0x35 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port6,0x36 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port7,0x37 ,"3.814697266e-6" ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port0,0x30 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port1,0x31 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port2,0x32 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port3,0x33 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port4,0x34 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port5,0x35 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port6,0x36 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port7,0x37 ,3.814697266e-6 ),/* Free Running Clock Counter */ INTEL_UNCORE_EVENT_DESC (clockticks,"event=0xff,umask=0x40" ),
Signature · 1 line
2.52.0
Quoted 6 lines · Zide Chen
The third argument in
INTEL_UNCORE_FR_EVENT_DESC()is subject to__stringify(), and the extra double quote marks can result in the expansion "3.814697266e-6" in the sysfs knobs, instead of 3.814697266e-6.
Quoted 7 lines
This is incorrect, though it may still work for perf, e.g. perf stat -e uncore_iio_free_running_0/bw_in_port0/
Fixes d8987048f665 ("perf/x86/intel/uncore: Support IIO free-running counters on DMR")Reported-by Chun-Tse Shao <[email protected]>Signed-off-by Zide Chen <[email protected]>
Thanks for the fix!
-CT
Quoted 70 lines
--- arch/x86/events/intel/uncore_snbep.c | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-)arch/x86/events/intel/uncore_snbep.c +24
-25@@ -6909,34 +6909,34 @@ static struct freerunning_counters dmr_iio_freerunning[] = {static struct uncore_event_desc dmr_uncore_iio_freerunning_events[] = {/* ITC Free Running Data BW counter for inbound traffic */ -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port0,0x10 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port1,0x11 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port2,0x12 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port3,0x13 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port4,0x14 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port5,0x15 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port6,0x16 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port7,0x17 ,"3.814697266e-6" ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port0,0x10 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port1,0x11 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port2,0x12 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port3,0x13 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port4,0x14 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port5,0x15 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port6,0x16 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port7,0x17 ,3.814697266e-6 ),/* ITC Free Running BW IN counters */ -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port0,0x20 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port1,0x21 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port2,0x22 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port3,0x23 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port4,0x24 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port5,0x25 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port6,0x26 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port7,0x27 ,"3.814697266e-6" ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port0,0x20 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port1,0x21 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port2,0x22 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port3,0x23 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port4,0x24 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port5,0x25 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port6,0x26 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port7,0x27 ,3.814697266e-6 ),/* ITC Free Running BW OUT counters */ -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port0,0x30 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port1,0x31 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port2,0x32 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port3,0x33 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port4,0x34 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port5,0x35 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port6,0x36 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port7,0x37 ,"3.814697266e-6" ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port0,0x30 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port1,0x31 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port2,0x32 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port3,0x33 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port4,0x34 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port5,0x35 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port6,0x36 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port7,0x37 ,3.814697266e-6 ),/* Free Running Clock Counter */ INTEL_UNCORE_EVENT_DESC (clockticks,"event=0xff,umask=0x40" ), --2.52.0
Quoted 69 lines · Zide Chen
The third argument in
INTEL_UNCORE_FR_EVENT_DESC()is subject to__stringify(), and the extra double quote marks can result in the expansion "3.814697266e-6" in the sysfs knobs, instead of 3.814697266e-6.This is incorrect, though it may still work for perf, e.g. perf stat -e uncore_iio_free_running_0/bw_in_port0/
Fixes d8987048f665 ("perf/x86/intel/uncore: Support IIO free-running counters on DMR")Reported-by Chun-Tse Shao <[email protected]>Signed-off-by Zide Chen <[email protected]>--- arch/x86/events/intel/uncore_snbep.c | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-)arch/x86/events/intel/uncore_snbep.c +17
-24@@ -6909,34 +6909,34 @@ static struct freerunning_counters dmr_iio_freerunning[] = {static struct uncore_event_desc dmr_uncore_iio_freerunning_events[] = {/* ITC Free Running Data BW counter for inbound traffic */ -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port0,0x10 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port1,0x11 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port2,0x12 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port3,0x13 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port4,0x14 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port5,0x15 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port6,0x16 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (inb_data_port7,0x17 ,"3.814697266e-6" ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port0,0x10 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port1,0x11 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port2,0x12 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port3,0x13 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port4,0x14 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port5,0x15 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port6,0x16 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (inb_data_port7,0x17 ,3.814697266e-6 ),/* ITC Free Running BW IN counters */ -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port0,0x20 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port1,0x21 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port2,0x22 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port3,0x23 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port4,0x24 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port5,0x25 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port6,0x26 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_in_port7,0x27 ,"3.814697266e-6" ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port0,0x20 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port1,0x21 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port2,0x22 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port3,0x23 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port4,0x24 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port5,0x25 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port6,0x26 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_in_port7,0x27 ,3.814697266e-6 ),/* ITC Free Running BW OUT counters */ -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port0,0x30 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port1,0x31 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port2,0x32 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port3,0x33 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port4,0x34 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port5,0x35 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port6,0x36 ,"3.814697266e-6" ), -INTEL_UNCORE_FR_EVENT_DESC (bw_out_port7,0x37 ,"3.814697266e-6" ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port0,0x30 ,3.814697266e-6 ),
arch/x86/events/intel/uncore_snbep.c static struct freerunning_counters dmr_iio_freerunning[] = { · line 6942
Quoted 10 lines
arch/x86/events/intel/uncore_snbep.c +7
-0+INTEL_UNCORE_FR_EVENT_DESC (bw_out_port1,0x31 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port2,0x32 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port3,0x33 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port4,0x34 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port5,0x35 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port6,0x36 ,3.814697266e-6 ), +INTEL_UNCORE_FR_EVENT_DESC (bw_out_port7,0x37 ,3.814697266e-6 ),/* Free Running Clock Counter */ INTEL_UNCORE_EVENT_DESC(clockticks, "event=0xff,umask=0x40"),