Commit 5a059790 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf jevents: Remove jevents.c 



Remove files and build rules.

Remove test for comparing with jevents.py as there is no longer a binary
to compare with.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Tested-by: default avatarJohn Garry <john.garry@huawei.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ananth Narayan <ananth.narayan@amd.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrew Kilroy <andrew.kilroy@arm.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Felix Fietkau <nbd@nbd.name>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kshipra Bopardikar <kshipra.bopardikar@intel.com>
Cc: Like Xu <likexu@tencent.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nick Forrington <nick.forrington@arm.com>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Qi Liu <liuqi115@huawei.com>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Santosh Shukla <santosh.shukla@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20220629182505.406269-5-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 00facc76

tools/perf/Makefile.perf

+2 −19
Original line number Diff line number Diff line
@@ -651,32 +651,15 @@ strip: $(PROGRAMS) $(OUTPUT)perf 


PERF_IN := $(OUTPUT)perf-in.o



JEVENTS       := $(OUTPUT)pmu-events/jevents

JEVENTS_IN    := $(OUTPUT)pmu-events/jevents-in.o



PMU_EVENTS_IN := $(OUTPUT)pmu-events/pmu-events-in.o

export NO_JEVENTS



export JEVENTS



build := -f $(srctree)/tools/build/Makefile.build dir=. obj



$(PERF_IN): prepare FORCE

	$(Q)$(MAKE) $(build)=perf



$(JEVENTS_IN): FORCE

	$(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=pmu-events obj=jevents



$(JEVENTS): $(JEVENTS_IN)

	$(QUIET_LINK)$(HOSTCC) $(JEVENTS_IN) -o $@



JEVENTS_PY	:=  pmu-events/jevents.py

JEVENTS_PY_TEST	:=  pmu-events/jevents-test.sh

.PHONY: jevents-py-test

jevents-py-test: $(JEVENTS)

	$(Q)$(call echo-cmd,gen)$(JEVENTS_PY_TEST) $(JEVENTS) $(JEVENTS_PY) pmu-events/arch



$(PMU_EVENTS_IN): $(JEVENTS) FORCE

$(PMU_EVENTS_IN): FORCE

	$(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=pmu-events obj=pmu-events



$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(PMU_EVENTS_IN) $(LIBTRACEEVENT_DYNAMIC_LIST)
@@ -1096,7 +1079,7 @@ clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clea 
	$(call QUIET_CLEAN, core-objs)  $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive $(OUTPUT)perf-iostat $(LANG_BINDINGS)

	$(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete

	$(Q)$(RM) $(OUTPUT).config-detected

	$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 $(OUTPUT)pmu-events/jevents $(OUTPUT)$(LIBJVMTI).so

	$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 $(OUTPUT)$(LIBJVMTI).so

	$(call QUIET_CLEAN, core-gen)   $(RM)  *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \

		$(OUTPUT)util/intel-pt-decoder/inat-tables.c \

		$(OUTPUT)tests/llvm-src-{base,kbuild,prologue,relocation}.c \

tools/perf/pmu-events/Build

+0 −4
Original line number Diff line number Diff line 
hostprogs := jevents



jevents-y	+= json.o jsmn.o jevents.o

HOSTCFLAGS_jevents.o	= -I$(srctree)/tools/include

pmu-events-y	+= pmu-events.o

JDIR		=  pmu-events/arch/$(SRCARCH)

JSON		=  $(shell [ -d $(JDIR) ] &&				\

tools/perf/pmu-events/jevents-test.sh

deleted100755 → 0
+0 −33
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)

# Validate that the legacy jevents and jevents.py produce identical output.

set -e



JEVENTS="$1"

JEVENTS_PY="$2"

ARCH_PATH="$3"

JEVENTS_C_GENERATED=$(mktemp /tmp/jevents_c.XXXXX.c)

JEVENTS_PY_GENERATED=$(mktemp /tmp/jevents_py.XXXXX.c)



cleanup() {

  rm "$JEVENTS_C_GENERATED" "$JEVENTS_PY_GENERATED"

  trap - exit term int

}

trap cleanup exit term int



for path in "$ARCH_PATH"/*

do

  arch=$(basename $path)

  if [ "$arch" = "test" ]

  then

    continue

  fi

  echo "Checking architecture: $arch"

  echo "Generating using jevents.c"

  "$JEVENTS" "$arch" "$ARCH_PATH" "$JEVENTS_C_GENERATED"

  echo "Generating using jevents.py"

  "$JEVENTS_PY" "$arch" "$ARCH_PATH" "$JEVENTS_PY_GENERATED"

  echo "Diffing"

  diff -u "$JEVENTS_C_GENERATED" "$JEVENTS_PY_GENERATED"

done

cleanup