Skip to contentSkip to conversation

perf tools: Add missing case value

PATCH In review Solomon Tan 3 participants 3 messages Mar 22, 2019 – Mar 29, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 perf tools: Add missing case value

The following error was thrown when compiling tools/perf using OpenCSD v0.11.1. This patch fixes said error.

```
  CC       util/intel-pt-decoder/intel-pt-log.o
  CC       util/cs-etm-decoder/cs-etm-decoder.o
util/cs-etm-decoder/cs-etm-decoder.c: In function
‘cs_etm_decoder__buffer_range’:
util/cs-etm-decoder/cs-etm-decoder.c:370:2: error: enumeration value
‘OCSD_INSTR_WFI_WFE’ not handled in switch [-Werror=switch-enum]
  switch (elem->last_i_type) {
  ^~~~~~
  CC       util/intel-pt-decoder/intel-pt-decoder.o
cc1: all warnings being treated as errors
```

Because OCSD_INSTR_WFI_WFE case was added only in v0.11.0, the minimum required OpenCSD library version for this patch is no longer v0.10.0.

---
 tools/build/feature/test-libopencsd.c           | 4 ++--
 tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
tools/build/feature/test-libopencsd.c +2 -2
index d68eb4fb40cc..2b0e02c38870 100644
@@ -4,9 +4,9 @@
 /*
  * Check OpenCSD library version is sufficient to provide required features
  */
-#define OCSD_MIN_VER ((0 << 16) | (10 << 8) | (0))
+#define OCSD_MIN_VER ((0 << 16) | (11 << 8) | (0))
 #if !defined(OCSD_VER_NUM) || (OCSD_VER_NUM < OCSD_MIN_VER)
-#error "OpenCSD >= 0.10.0 is required"
+#error "OpenCSD >= 0.11.0 is required"
 #endif
 
 int main(void)
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +1 -0
index ba4c623cd8de..39fe21e1cf93 100644
@@ -387,6 +387,7 @@ cs_etm_decoder__buffer_range(struct cs_etm_decoder *decoder,
 		break;
 	case OCSD_INSTR_ISB:
 	case OCSD_INSTR_DSB_DMB:
+	case OCSD_INSTR_WFI_WFE:
 	case OCSD_INSTR_OTHER:
 	default:
 		packet->last_instr_taken_branch = false;
Signature · 1 line
2.19.1
Reviewed-by on v5 1/1
#1 lore raw
Quoted 54 lines · Solomon Tan

The following error was thrown when compiling tools/perf using OpenCSD v0.11.1. This patch fixes said error.

```
  CC       util/intel-pt-decoder/intel-pt-log.o
  CC       util/cs-etm-decoder/cs-etm-decoder.o
util/cs-etm-decoder/cs-etm-decoder.c: In function
‘cs_etm_decoder__buffer_range’:
util/cs-etm-decoder/cs-etm-decoder.c:370:2: error: enumeration value
‘OCSD_INSTR_WFI_WFE’ not handled in switch [-Werror=switch-enum]
  switch (elem->last_i_type) {
  ^~~~~~
  CC       util/intel-pt-decoder/intel-pt-decoder.o
cc1: all warnings being treated as errors
```

Because OCSD_INSTR_WFI_WFE case was added only in v0.11.0, the minimum required OpenCSD library version for this patch is no longer v0.10.0.

---
 tools/build/feature/test-libopencsd.c           | 4 ++--
 tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
tools/build/feature/test-libopencsd.c +2 -2
index d68eb4fb40cc..2b0e02c38870 100644
@@ -4,9 +4,9 @@
 /*
  * Check OpenCSD library version is sufficient to provide required features
  */
-#define OCSD_MIN_VER ((0 << 16) | (10 << 8) | (0))
+#define OCSD_MIN_VER ((0 << 16) | (11 << 8) | (0))
 #if !defined(OCSD_VER_NUM) || (OCSD_VER_NUM < OCSD_MIN_VER)
-#error "OpenCSD >= 0.10.0 is required"
+#error "OpenCSD >= 0.11.0 is required"
 #endif
 
 int main(void)
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +1 -1
index ba4c623cd8de..39fe21e1cf93 100644
@@ -387,6 +387,7 @@ cs_etm_decoder__buffer_range(struct cs_etm_decoder *decoder,
                break;
        case OCSD_INSTR_ISB:
        case OCSD_INSTR_DSB_DMB:
+       case OCSD_INSTR_WFI_WFE:
        case OCSD_INSTR_OTHER:
        default:
                packet->last_instr_taken_branch = false;
--
Quoted 1 line

2.19.1

Arnaldo, please add on your side if satisfied with the code.

Thanks,
Mathieu

Quoted 1 line
#2 lore raw

[tip:perf/urgent] perf cs-etm: Add missing case value

In reply to Solomon Tan
perf cs-etm: Add missing case value
Commit-ID:  c8fa7a807f3c5f946bd92076fbaf7826edb650dc
Gitweb:     https://git.kernel.org/tip/c8fa7a807f3c5f946bd92076fbaf7826edb650dc
Author:     Solomon Tan <[email protected]>
AuthorDate: Fri, 22 Mar 2019 13:22:55 +0800
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 28 Mar 2019 14:31:55 -0300

perf cs-etm: Add missing case value

The following error was thrown when compiling tools/perf using OpenCSD v0.11.1. This patch fixes said error.

CC util/intel-pt-decoder/intel-pt-log.o
CC util/cs-etm-decoder/cs-etm-decoder.o
util/cs-etm-decoder/cs-etm-decoder.c: In function ‘cs_etm_decoder__buffer_range’:
util/cs-etm-decoder/cs-etm-decoder.c:370:2: error: enumeration value ‘OCSD_INSTR_WFI_WFE’ not handled in switch [-Werror=switch-enum]

    switch (elem->last_i_type) {
    ^~~~~~
    CC       util/intel-pt-decoder/intel-pt-decoder.o

cc1: all warnings being treated as errors

Because OCSD_INSTR_WFI_WFE case was added only in v0.11.0, the minimum required OpenCSD library version for this patch is no longer v0.10.0.

---
 tools/build/feature/test-libopencsd.c           | 4 ++--
 tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
tools/build/feature/test-libopencsd.c +2 -2
index d68eb4fb40cc..2b0e02c38870 100644
@@ -4,9 +4,9 @@
 /*
  * Check OpenCSD library version is sufficient to provide required features
  */
-#define OCSD_MIN_VER ((0 << 16) | (10 << 8) | (0))
+#define OCSD_MIN_VER ((0 << 16) | (11 << 8) | (0))
 #if !defined(OCSD_VER_NUM) || (OCSD_VER_NUM < OCSD_MIN_VER)
-#error "OpenCSD >= 0.10.0 is required"
+#error "OpenCSD >= 0.11.0 is required"
 #endif
 
 int main(void)
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +1 -0
index ba4c623cd8de..39fe21e1cf93 100644
@@ -387,6 +387,7 @@ cs_etm_decoder__buffer_range(struct cs_etm_decoder *decoder,
 		break;
 	case OCSD_INSTR_ISB:
 	case OCSD_INSTR_DSB_DMB:
+	case OCSD_INSTR_WFI_WFE:
 	case OCSD_INSTR_OTHER:
 	default:
 		packet->last_instr_taken_branch = false;