Em Tue, Sep 01, 2015 at 03:16:52PM +0300, Adrian Hunter escreveu: > On 01/09/15 11:54, Ingo Molnar wrote: > > > > * Adrian Hunter <[email protected]> wrote: > > > >> Hi > >> > >> perf tools has a copy of the x86 instruction decoder for decoding > >> Intel PT. [...] > > > > So that's the arch/x86/lib/insn.c instruction length decoder that the > > kernel uses > > for kprobes et al - and the two versions already forked slightly: > > > > -#include "inat.h" > > -#include "insn.h" > > +#include <asm/inat.h> > > +#include <asm/insn.h> > > > > it would be nice to add a diff check to the perf build, and (non-fatally) > > warn > > during the build if the two versions depart from each other? > > I had a go and came up with this. Arnaldo, Jiri any comments?
So, I was going to try and merge this series, can you please collect the Acks by Masami and Jiri and resubmit? I'd say no need to stop this just to get a build function to use with this, the test below should do the trick _for this specific instance_ and then, after we get this, you should use it as the initial usecase for adding the build function, d'accord? Jiri, are you ok with this? - Arnaldo > diff --git a/tools/perf/util/intel-pt-decoder/Build > b/tools/perf/util/intel-pt-decoder/Build > index 240730d682c1..1b8a32de8504 100644 > --- a/tools/perf/util/intel-pt-decoder/Build > +++ b/tools/perf/util/intel-pt-decoder/Build > @@ -6,6 +6,17 @@ inat_tables_maps = util/intel-pt-decoder/x86-opcode-map.txt > $(OUTPUT)util/intel-pt-decoder/inat-tables.c: $(inat_tables_script) > $(inat_tables_maps) > @$(call echo-cmd,gen)$(AWK) -f $(inat_tables_script) > $(inat_tables_maps) > $@ || rm -f $@ > > -$(OUTPUT)util/intel-pt-decoder/intel-pt-insn-decoder.o: > util/intel-pt-decoder/inat.c $(OUTPUT)util/intel-pt-decoder/inat-tables.c > +$(OUTPUT)util/intel-pt-decoder/intel-pt-insn-decoder.o: > util/intel-pt-decoder/intel-pt-insn-decoder.c util/intel-pt-decoder/inat.c > $(OUTPUT)util/intel-pt-decoder/inat-tables.c > + @test -d ../../arch/x86 && (( \ > + diff -B -I'^#include' util/intel-pt-decoder/insn.c > ../../arch/x86/lib/insn.c >/dev/null && \ > + diff -B -I'^#include' util/intel-pt-decoder/inat.c > ../../arch/x86/lib/inat.c >/dev/null && \ > + diff -B util/intel-pt-decoder/x86-opcode-map.txt > ../../arch/x86/lib/x86-opcode-map.txt >/dev/null && \ > + diff -B util/intel-pt-decoder/gen-insn-attr-x86.awk > ../../arch/x86/tools/gen-insn-attr-x86.awk >/dev/null && \ > + diff -B -I'^#include' util/intel-pt-decoder/insn.h > ../../arch/x86/include/asm/insn.h >/dev/null && \ > + diff -B -I'^#include' util/intel-pt-decoder/inat.h > ../../arch/x86/include/asm/inat.h >/dev/null && \ > + diff -B -I'^#include' util/intel-pt-decoder/inat_types.h > ../../arch/x86/include/asm/inat_types.h >/dev/null) \ > + || echo "Warning: Intel PT: x86 instruction decoder differs from > kernel" >&2 ) > + $(call rule_mkdir) > + $(call if_changed_dep,cc_o_c) > > CFLAGS_intel-pt-insn-decoder.o += -I$(OUTPUT)util/intel-pt-decoder > -Wno-override-init > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
