| Message ID | 20200501143615.1180-1-mike.leach@linaro.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 29e2eb2a9e1fac8b320bf2b4c628c336afbdd84f |
| Headers | show |
| Series | [v2] perf: cs-etm: Update to build with latest opencsd version. | expand |
On Fri, May 01, 2020 at 03:36:15PM +0100, Mike Leach wrote: > OpenCSD version v0.14.0 adds in a new output element. This is represented > by a new value in the generic element type enum, which must be added to > the handling code in perf cs-etm-decoder to prevent build errors due to > build options on the perf project. > > This element is not currently used by the perf decoder. > > Perf build feature test updated to require a minimum of 0.14.0 > > Tested on Linux 5.7-rc3. > > Signed-off-by: Mike Leach <mike.leach@linaro.org> Looks good to me, FWIW: Reviewed-by: Leo Yan <leo.yan@linaro.org> > --- > tools/build/feature/test-libopencsd.c | 4 ++-- > tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 2 ++ > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tools/build/feature/test-libopencsd.c b/tools/build/feature/test-libopencsd.c > index 2b0e02c38870..1547bc2c0950 100644 > --- a/tools/build/feature/test-libopencsd.c > +++ b/tools/build/feature/test-libopencsd.c > @@ -4,9 +4,9 @@ > /* > * Check OpenCSD library version is sufficient to provide required features > */ > -#define OCSD_MIN_VER ((0 << 16) | (11 << 8) | (0)) > +#define OCSD_MIN_VER ((0 << 16) | (14 << 8) | (0)) > #if !defined(OCSD_VER_NUM) || (OCSD_VER_NUM < OCSD_MIN_VER) > -#error "OpenCSD >= 0.11.0 is required" > +#error "OpenCSD >= 0.14.0 is required" > #endif > > int main(void) > diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > index cd92a99eb89d..cd007cc9c283 100644 > --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > @@ -564,6 +564,8 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( > resp = cs_etm_decoder__set_tid(etmq, packet_queue, > elem, trace_chan_id); > break; > + /* Unused packet types */ > + case OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH: > case OCSD_GEN_TRC_ELEM_ADDR_NACC: > case OCSD_GEN_TRC_ELEM_CYCLE_COUNT: > case OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN: > -- > 2.17.1 > > _______________________________________________ > CoreSight mailing list > CoreSight@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/coresight
On Fri, May 01, 2020 at 03:36:15PM +0100, Mike Leach wrote: > OpenCSD version v0.14.0 adds in a new output element. This is represented > by a new value in the generic element type enum, which must be added to > the handling code in perf cs-etm-decoder to prevent build errors due to > build options on the perf project. > > This element is not currently used by the perf decoder. > > Perf build feature test updated to require a minimum of 0.14.0 > > Tested on Linux 5.7-rc3. > > Signed-off-by: Mike Leach <mike.leach@linaro.org> > --- > tools/build/feature/test-libopencsd.c | 4 ++-- > tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 2 ++ > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tools/build/feature/test-libopencsd.c b/tools/build/feature/test-libopencsd.c > index 2b0e02c38870..1547bc2c0950 100644 > --- a/tools/build/feature/test-libopencsd.c > +++ b/tools/build/feature/test-libopencsd.c > @@ -4,9 +4,9 @@ > /* > * Check OpenCSD library version is sufficient to provide required features > */ > -#define OCSD_MIN_VER ((0 << 16) | (11 << 8) | (0)) > +#define OCSD_MIN_VER ((0 << 16) | (14 << 8) | (0)) > #if !defined(OCSD_VER_NUM) || (OCSD_VER_NUM < OCSD_MIN_VER) > -#error "OpenCSD >= 0.11.0 is required" > +#error "OpenCSD >= 0.14.0 is required" > #endif > > int main(void) > diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > index cd92a99eb89d..cd007cc9c283 100644 > --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > @@ -564,6 +564,8 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( > resp = cs_etm_decoder__set_tid(etmq, packet_queue, > elem, trace_chan_id); > break; > + /* Unused packet types */ > + case OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH: Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > case OCSD_GEN_TRC_ELEM_ADDR_NACC: > case OCSD_GEN_TRC_ELEM_CYCLE_COUNT: > case OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN: > -- > 2.17.1 >
Em Mon, May 04, 2020 at 11:06:18AM -0600, Mathieu Poirier escreveu: > On Fri, May 01, 2020 at 03:36:15PM +0100, Mike Leach wrote: > > OpenCSD version v0.14.0 adds in a new output element. This is represented > > by a new value in the generic element type enum, which must be added to > > the handling code in perf cs-etm-decoder to prevent build errors due to > > build options on the perf project. > > > > This element is not currently used by the perf decoder. > > > > Perf build feature test updated to require a minimum of 0.14.0 > > > > Tested on Linux 5.7-rc3. > > > > Signed-off-by: Mike Leach <mike.leach@linaro.org> > Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> Thanks, applied with both your and Leo's R-by tags. - Arnaldo
diff --git a/tools/build/feature/test-libopencsd.c b/tools/build/feature/test-libopencsd.c index 2b0e02c38870..1547bc2c0950 100644 --- a/tools/build/feature/test-libopencsd.c +++ b/tools/build/feature/test-libopencsd.c @@ -4,9 +4,9 @@ /* * Check OpenCSD library version is sufficient to provide required features */ -#define OCSD_MIN_VER ((0 << 16) | (11 << 8) | (0)) +#define OCSD_MIN_VER ((0 << 16) | (14 << 8) | (0)) #if !defined(OCSD_VER_NUM) || (OCSD_VER_NUM < OCSD_MIN_VER) -#error "OpenCSD >= 0.11.0 is required" +#error "OpenCSD >= 0.14.0 is required" #endif int main(void) diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c index cd92a99eb89d..cd007cc9c283 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -564,6 +564,8 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( resp = cs_etm_decoder__set_tid(etmq, packet_queue, elem, trace_chan_id); break; + /* Unused packet types */ + case OCSD_GEN_TRC_ELEM_I_RANGE_NOPATH: case OCSD_GEN_TRC_ELEM_ADDR_NACC: case OCSD_GEN_TRC_ELEM_CYCLE_COUNT: case OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN:
OpenCSD version v0.14.0 adds in a new output element. This is represented by a new value in the generic element type enum, which must be added to the handling code in perf cs-etm-decoder to prevent build errors due to build options on the perf project. This element is not currently used by the perf decoder. Perf build feature test updated to require a minimum of 0.14.0 Tested on Linux 5.7-rc3. Signed-off-by: Mike Leach <mike.leach@linaro.org> --- tools/build/feature/test-libopencsd.c | 4 ++-- tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)