Skip to contentSkip to conversation

x86 insn decoder test updates (Re: linux-next: Tree for October 29 (x86 posttest))

PATCH In review Masami Hiramatsu 3 participants 15 messages Nov 16, 2009 – Nov 21, 2009

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

cover x86 insn decoder test updates (Re: linux-next: Tree for October 29 (x86 posttest))

Here are the patches which update x86 instruction decoder build-time test. As Stephen reported on linux-next, sometimes objdump decodes bad instructions as normal. This will cause a false positive result on x86 insn decoder test. This patches update the test as below;
- Show more information with V=1
- Show in which symbol the difference places.
- Just warning instead of build failure.

Thank you,

---

Masami Hiramatsu (3):
x86: insn decoder test shows build warning
x86: Show symbol name if insn decoder test failed
x86: Add verbose option to insn decoder test

 arch/x86/tools/Makefile       |    9 +++-
 arch/x86/tools/distill.awk    |    5 ++
 arch/x86/tools/test_get_len.c |   99 ++++++++++++++++++++++++++++++++++-------
 3 files changed, 95 insertions(+), 18 deletions(-)
Signature · 6 lines
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division
e-mail: [email protected]
#1 lore raw

PATCH 1/3 x86: Add verbose option to insn decoder test

Add verbose option to insn decoder test. This dumps decoded instruction when building kernel with V=1.

Cc Ingo Molnar <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Jim Keniston <[email protected]>

---

 arch/x86/tools/Makefile       |    9 ++++-
 arch/x86/tools/test_get_len.c |   74 +++++++++++++++++++++++++++++++++++------
 2 files changed, 71 insertions(+), 12 deletions(-)
arch/x86/tools/Makefile +8 -1
index 5e295d9..4688f90 100644
@@ -1,6 +1,13 @@
 PHONY += posttest
+
+ifeq ($(KBUILD_VERBOSE),1)
+  postest_verbose = -v
+else
+  postest_verbose =
+endif
+
 quiet_cmd_posttest = TEST    $@
-      cmd_posttest = $(OBJDUMP) -d -j .text $(objtree)/vmlinux | awk -f $(srctree)/arch/x86/tools/distill.awk | $(obj)/test_get_len $(CONFIG_64BIT)
+      cmd_posttest = $(OBJDUMP) -d -j .text $(objtree)/vmlinux | awk -f $(srctree)/arch/x86/tools/distill.awk | $(obj)/test_get_len -$(CONFIG_64BIT) $(posttest_verbose)
 
 posttest: $(obj)/test_get_len vmlinux
 	$(call cmd,posttest)
arch/x86/tools/test_get_len.c +63 -11

109 lines not on this page · raw message

Signature · 7 lines
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: [email protected]
#2 lore raw

[tip:perf/probes] x86: Add verbose option to insn decoder test

Commit-ID:  d65ff75fbe6f8ac7c17f18e4108521898468822c
Gitweb:     http://git.kernel.org/tip/d65ff75fbe6f8ac7c17f18e4108521898468822c
Author:     Masami Hiramatsu <[email protected]>
AuthorDate: Mon, 16 Nov 2009 18:06:18 -0500
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 17 Nov 2009 07:16:48 +0100

x86: Add verbose option to insn decoder test

Add verbose option to insn decoder test. This dumps decoded instruction when building kernel with V=1.

Cc systemtap <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Jim Keniston <[email protected]>
Cc Stephen Rothwell <[email protected]>

LKML-Reference: <20091116230618.5250.18762.stgit@harusame>

---
 arch/x86/tools/Makefile       |    9 ++++-
 arch/x86/tools/test_get_len.c |   74 ++++++++++++++++++++++++++++++++++------
 2 files changed, 71 insertions(+), 12 deletions(-)
arch/x86/tools/Makefile +8 -1
index 5e295d9..4688f90 100644
@@ -1,6 +1,13 @@
 PHONY += posttest
+
+ifeq ($(KBUILD_VERBOSE),1)
+  postest_verbose = -v
+else
+  postest_verbose =
+endif
+
 quiet_cmd_posttest = TEST    $@
-      cmd_posttest = $(OBJDUMP) -d -j .text $(objtree)/vmlinux | awk -f $(srctree)/arch/x86/tools/distill.awk | $(obj)/test_get_len $(CONFIG_64BIT)
+      cmd_posttest = $(OBJDUMP) -d -j .text $(objtree)/vmlinux | awk -f $(srctree)/arch/x86/tools/distill.awk | $(obj)/test_get_len -$(CONFIG_64BIT) $(posttest_verbose)
 
 posttest: $(obj)/test_get_len vmlinux
 	$(call cmd,posttest)
arch/x86/tools/test_get_len.c +63 -11

109 lines not on this page · raw message

#3 lore raw

PATCH 2/3 x86: Show symbol name if insn decoder test failed

In reply to Masami Hiramatsu

Show symbol name if insn decoder test find a difference. This will help us to find out where the issue is.

Cc Ingo Molnar <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Jim Keniston <[email protected]>

---

 arch/x86/tools/distill.awk    |    5 +++++
 arch/x86/tools/test_get_len.c |   10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletions(-)
arch/x86/tools/distill.awk +5 -0
index d433619..c13c0ee 100644
@@ -15,6 +15,11 @@ BEGIN {
 	fwait_str="9b\tfwait"
 }
 
+/^ *[0-9a-f]+ <[^>]*>:/ {
+	# Symbol entry
+	printf("%s%s\n", $2, $1)
+}
+
 /^ *[0-9a-f]+:/ {
 	if (split($0, field, "\t") < 3) {
 		# This is a continuation of the same insn.
arch/x86/tools/test_get_len.c +9 -1
index 5743e51..af75e07 100644
@@ -110,7 +110,7 @@ static void parse_args(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
-	char line[BUFSIZE];
+	char line[BUFSIZE], sym[BUFSIZE] = "<unknown>";
 	unsigned char insn_buf[16];
 	struct insn insn;
 	int insns = 0, c;
@@ -122,6 +122,12 @@ int main(int argc, char **argv)
 		int nb = 0;
 		unsigned int b;
 
+		if (line[0] == '<') {
+			/* Symbol line */
+			strcpy(sym, line);
+			continue;
+		}
+
 		insns++;
 		memset(insn_buf, 0, 16);
 		strcpy(copy, line);
@@ -145,6 +151,8 @@ int main(int argc, char **argv)
 		insn_init(&insn, insn_buf, x86_64);
 		insn_get_length(&insn);
 		if (insn.length != nb) {
+			fprintf(stderr, "Error: %s found a difference at %s\n",
+				prog, sym);
 			fprintf(stderr, "Error: %s", line);
 			fprintf(stderr, "Error: objdump says %d bytes, but "
 				"insn_get_length() says %d\n", nb,
Signature · 7 lines
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: [email protected]
#4 lore raw

[tip:perf/probes] x86: Show symbol name if insn decoder test failed

Commit-ID:  35039eb6b199749943547c8572be6604edf00229
Gitweb:     http://git.kernel.org/tip/35039eb6b199749943547c8572be6604edf00229
Author:     Masami Hiramatsu <[email protected]>
AuthorDate: Mon, 16 Nov 2009 18:06:24 -0500
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 17 Nov 2009 07:16:50 +0100

x86: Show symbol name if insn decoder test failed

Show symbol name if insn decoder test find a difference. This will help us to find out where the issue is.

Cc systemtap <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Jim Keniston <[email protected]>
Cc Stephen Rothwell <[email protected]>

LKML-Reference: <20091116230624.5250.49813.stgit@harusame>

---
 arch/x86/tools/distill.awk    |    5 +++++
 arch/x86/tools/test_get_len.c |   10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletions(-)
arch/x86/tools/distill.awk +5 -0
index d433619..c13c0ee 100644
@@ -15,6 +15,11 @@ BEGIN {
 	fwait_str="9b\tfwait"
 }
 
+/^ *[0-9a-f]+ <[^>]*>:/ {
+	# Symbol entry
+	printf("%s%s\n", $2, $1)
+}
+
 /^ *[0-9a-f]+:/ {
 	if (split($0, field, "\t") < 3) {
 		# This is a continuation of the same insn.
arch/x86/tools/test_get_len.c +9 -1
index 5743e51..af75e07 100644
@@ -110,7 +110,7 @@ static void parse_args(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
-	char line[BUFSIZE];
+	char line[BUFSIZE], sym[BUFSIZE] = "<unknown>";
 	unsigned char insn_buf[16];
 	struct insn insn;
 	int insns = 0, c;
@@ -122,6 +122,12 @@ int main(int argc, char **argv)
 		int nb = 0;
 		unsigned int b;
 
+		if (line[0] == '<') {
+			/* Symbol line */
+			strcpy(sym, line);
+			continue;
+		}
+
 		insns++;
 		memset(insn_buf, 0, 16);
 		strcpy(copy, line);
@@ -145,6 +151,8 @@ int main(int argc, char **argv)
 		insn_init(&insn, insn_buf, x86_64);
 		insn_get_length(&insn);
 		if (insn.length != nb) {
+			fprintf(stderr, "Error: %s found a difference at %s\n",
+				prog, sym);
 			fprintf(stderr, "Error: %s", line);
 			fprintf(stderr, "Error: objdump says %d bytes, but "
 				"insn_get_length() says %d\n", nb,
#5 lore raw

PATCH 3/3 x86: insn decoder test shows build warning

In reply to Masami Hiramatsu

Since some instructions are not decoded correctly by objdump, it may cause false positive error in insn decoder posttest. This changes build error of insn decoder test to build warning.

Cc Ingo Molnar <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Jim Keniston <[email protected]>

---

 arch/x86/tools/test_get_len.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
arch/x86/tools/test_get_len.c +11 -6
index af75e07..d8214dc 100644
@@ -114,6 +114,7 @@ int main(int argc, char **argv)
 	unsigned char insn_buf[16];
 	struct insn insn;
 	int insns = 0, c;
+	int warnings = 0;
 
 	parse_args(argc, argv);
 
@@ -151,18 +152,22 @@ int main(int argc, char **argv)
 		insn_init(&insn, insn_buf, x86_64);
 		insn_get_length(&insn);
 		if (insn.length != nb) {
-			fprintf(stderr, "Error: %s found a difference at %s\n",
+			warnings++;
+			fprintf(stderr, "Warning: %s found difference at %s\n",
 				prog, sym);
-			fprintf(stderr, "Error: %s", line);
-			fprintf(stderr, "Error: objdump says %d bytes, but "
+			fprintf(stderr, "Warning: %s", line);
+			fprintf(stderr, "Warning: objdump says %d bytes, but "
 				"insn_get_length() says %d\n", nb,
 				insn.length);
 			if (verbose)
 				dump_insn(stderr, &insn);
-			exit(2);
 		}
 	}
-	fprintf(stderr, "Succeed: decoded and checked %d instructions\n",
-		insns);
+	if (warnings)
+		fprintf(stderr, "Warning: decoded and checked %d"
+			" instructions with %d warnings\n", insns, warnings);
+	else
+		fprintf(stderr, "Succeed: decoded and checked %d"
+			" instructions\n", insns);
 	return 0;
 }
Signature · 7 lines
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: [email protected]
#6 lore raw

[tip:perf/core] x86: Instruction decoder test should generate build warning

Commit-ID:  ce64c62074d945fe5f8a7f01bdc30125f994ea67
Gitweb:     http://git.kernel.org/tip/ce64c62074d945fe5f8a7f01bdc30125f994ea67
Author:     Masami Hiramatsu <[email protected]>
AuthorDate: Mon, 16 Nov 2009 18:06:31 -0500
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 19 Nov 2009 21:40:13 +0100

x86: Instruction decoder test should generate build warning

Since some instructions are not decoded correctly by older versions of objdump, it may cause false positive error in insn decoder posttest.

This changes build error of insn decoder test to build warning.

Cc systemtap <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Jim Keniston <[email protected]>
Cc Stephen Rothwell <[email protected]>

LKML-Reference: <20091116230631.5250.41579.stgit@harusame>

---
 arch/x86/tools/test_get_len.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
arch/x86/tools/test_get_len.c +11 -6
index af75e07..d8214dc 100644
@@ -114,6 +114,7 @@ int main(int argc, char **argv)
 	unsigned char insn_buf[16];
 	struct insn insn;
 	int insns = 0, c;
+	int warnings = 0;
 
 	parse_args(argc, argv);
 
@@ -151,18 +152,22 @@ int main(int argc, char **argv)
 		insn_init(&insn, insn_buf, x86_64);
 		insn_get_length(&insn);
 		if (insn.length != nb) {
-			fprintf(stderr, "Error: %s found a difference at %s\n",
+			warnings++;
+			fprintf(stderr, "Warning: %s found difference at %s\n",
 				prog, sym);
-			fprintf(stderr, "Error: %s", line);
-			fprintf(stderr, "Error: objdump says %d bytes, but "
+			fprintf(stderr, "Warning: %s", line);
+			fprintf(stderr, "Warning: objdump says %d bytes, but "
 				"insn_get_length() says %d\n", nb,
 				insn.length);
 			if (verbose)
 				dump_insn(stderr, &insn);
-			exit(2);
 		}
 	}
-	fprintf(stderr, "Succeed: decoded and checked %d instructions\n",
-		insns);
+	if (warnings)
+		fprintf(stderr, "Warning: decoded and checked %d"
+			" instructions with %d warnings\n", insns, warnings);
+	else
+		fprintf(stderr, "Succeed: decoded and checked %d"
+			" instructions\n", insns);
 	return 0;
 }
#7 lore raw
In reply to Masami Hiramatsu
Quoted 8 lines · Masami Hiramatsu

Here are the patches which update x86 instruction decoder build-time test. As Stephen reported on linux-next, sometimes objdump decodes bad instructions as normal. This will cause a false positive result on x86 insn decoder test. This patches update the test as below;

- Show more information with V=1
- Show in which symbol the difference places.
- Just warning instead of build failure.

yes, -tip testing was showing such build bugs too:

Error: ffffffff8104aae3: c5 83 3d 49 80 ee lds 0xffffffffee80493d(%rbx),%eax
Error: objdump says 6 bytes, but insn_get_length() says 3 (attr:0)

it happens with older tools, such as binutils-2.17. Modern binutils (2.19) is fine.

We dont want to remove the build error: it helped us fix a number of real bugs in the decoder - instead please try to create a make based workaround based on binutils, to not run the test with binutils older than 2.19 or so.

Thanks,

Ingo

#8 lore raw
Quoted 12 lines · Ingo Molnar
Quoted 8 lines · Masami Hiramatsu

Here are the patches which update x86 instruction decoder build-time test. As Stephen reported on linux-next, sometimes objdump decodes bad instructions as normal. This will cause a false positive result on x86 insn decoder test. This patches update the test as below;

- Show more information with V=1
- Show in which symbol the difference places.
- Just warning instead of build failure.

Quoted 7 lines

yes, -tip testing was showing such build bugs too:

Error: ffffffff8104aae3: c5 83 3d 49 80 ee lds 0xffffffffee80493d(%rbx),%eax
Error: objdump says 6 bytes, but insn_get_length() says 3 (attr:0)

it happens with older tools, such as binutils-2.17. Modern binutils (2.19) is fine.

Thank you for telling me.

Quoted 4 lines

We dont want to remove the build error: it helped us fix a number of real bugs in the decoder - instead please try to create a make based workaround based on binutils, to not run the test with binutils older than 2.19 or so.

OK, that's fine for me.

Thank you,

Signature · 7 lines
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: [email protected]
#9 lore raw
In reply to Ingo Molnar
Quoted 17 lines · Ingo Molnar
Quoted 8 lines · Masami Hiramatsu

Here are the patches which update x86 instruction decoder build-time test. As Stephen reported on linux-next, sometimes objdump decodes bad instructions as normal. This will cause a false positive result on x86 insn decoder test. This patches update the test as below;

- Show more information with V=1
- Show in which symbol the difference places.
- Just warning instead of build failure.

yes, -tip testing was showing such build bugs too:

Error: ffffffff8104aae3: c5 83 3d 49 80 ee lds 0xffffffffee80493d(%rbx),%eax
Error: objdump says 6 bytes, but insn_get_length() says 3 (attr:0)

Quoted 8 lines

it happens with older tools, such as binutils-2.17. Modern binutils (2.19) is fine.

We dont want to remove the build error: it helped us fix a number of real bugs in the decoder - instead please try to create a make based workaround based on binutils, to not run the test with binutils older than 2.19 or so.

One idea might be to instead of binutils to use NASM. The entire NASM disassembler is small enough (about 10,000 lines including build tools and instruction database) that we could fit it in the tree in a pinch.

-hpa

Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.
#10 lore raw

cover x86 insn decoder test checking objdump version

In reply to Ingo Molnar

Hi Ingo,

Quoted 4 lines · Ingo Molnar

We dont want to remove the build error: it helped us fix a number of real bugs in the decoder - instead please try to create a make based workaround based on binutils, to not run the test with binutils older than 2.19 or so.

Agreed, this patch checks objdump version and skip the test if it is older than 2.19.

Thank you,

---

Masami Hiramatsu (2):
x86: insn decoder test checks objdump version [BUGFIX] x86: Fix insn decoder test typos

 arch/x86/tools/Makefile       |   15 ++++++++++++---
 arch/x86/tools/chkobjdump.awk |   23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 arch/x86/tools/chkobjdump.awk
Signature · 6 lines
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division
e-mail: [email protected]
#11 lore raw

PATCH 1/2 x86: Fix insn decoder test typos

Fix postest_verbose to posttest_verbose, and add posttest_64bit option for CONFIG_64BIT != y, since old command just passed '-' instead of '-n' when CONFIG_64BIT is not set.

Cc Ingo Molnar <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Jim Keniston <[email protected]>

---

 arch/x86/tools/Makefile |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
arch/x86/tools/Makefile +9 -3
index 4688f90..c80b079 100644
@@ -1,13 +1,19 @@
 PHONY += posttest
 
 ifeq ($(KBUILD_VERBOSE),1)
-  postest_verbose = -v
+  posttest_verbose = -v
 else
-  postest_verbose =
+  posttest_verbose =
+endif
+
+ifeq ($(CONFIG_64BIT),y)
+  posttest_64bit = -y
+else
+  posttest_64bit = -n
 endif
 
 quiet_cmd_posttest = TEST    $@
-      cmd_posttest = $(OBJDUMP) -d -j .text $(objtree)/vmlinux | awk -f $(srctree)/arch/x86/tools/distill.awk | $(obj)/test_get_len -$(CONFIG_64BIT) $(posttest_verbose)
+      cmd_posttest = $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(srctree)/arch/x86/tools/distill.awk | $(obj)/test_get_len $(posttest_64bit) $(posttest_verbose)
 
 posttest: $(obj)/test_get_len vmlinux
 	$(call cmd,posttest)
Signature · 7 lines
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: [email protected]
#12 lore raw

[tip:perf/probes] x86: Fix insn decoder test typos

Commit-ID:  80509e27e40d7554e576405ed9f5b7966c567112
Gitweb:     http://git.kernel.org/tip/80509e27e40d7554e576405ed9f5b7966c567112
Author:     Masami Hiramatsu <[email protected]>
AuthorDate: Fri, 20 Nov 2009 12:13:08 -0500
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Fri, 20 Nov 2009 22:59:36 -0800

x86: Fix insn decoder test typos

Fix postest_verbose to posttest_verbose, and add posttest_64bit option for CONFIG_64BIT != y, since old command just passed '-' instead of '-n' when CONFIG_64BIT is not set.

Cc Ingo Molnar <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Jim Keniston <[email protected]>

LKML-Reference: <[email protected]>

---
 arch/x86/tools/Makefile |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
arch/x86/tools/Makefile +9 -3
index 4688f90..c80b079 100644
@@ -1,13 +1,19 @@
 PHONY += posttest
 
 ifeq ($(KBUILD_VERBOSE),1)
-  postest_verbose = -v
+  posttest_verbose = -v
 else
-  postest_verbose =
+  posttest_verbose =
+endif
+
+ifeq ($(CONFIG_64BIT),y)
+  posttest_64bit = -y
+else
+  posttest_64bit = -n
 endif
 
 quiet_cmd_posttest = TEST    $@
-      cmd_posttest = $(OBJDUMP) -d -j .text $(objtree)/vmlinux | awk -f $(srctree)/arch/x86/tools/distill.awk | $(obj)/test_get_len -$(CONFIG_64BIT) $(posttest_verbose)
+      cmd_posttest = $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(srctree)/arch/x86/tools/distill.awk | $(obj)/test_get_len $(posttest_64bit) $(posttest_verbose)
 
 posttest: $(obj)/test_get_len vmlinux
 	$(call cmd,posttest)
#13 lore raw

PATCH 2/2 x86: insn decoder test checks objdump version

In reply to Masami Hiramatsu

Check objdump version before using it for insn decoder build test, because some older objdump can't decode AVX code correctly.

Cc Ingo Molnar <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Jim Keniston <[email protected]>

---

 arch/x86/tools/Makefile       |    5 ++++-
 arch/x86/tools/chkobjdump.awk |   23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)
 create mode 100644 arch/x86/tools/chkobjdump.awk
arch/x86/tools/Makefile +4 -1
index c80b079..f820826 100644
@@ -12,8 +12,11 @@ else
   posttest_64bit = -n
 endif
 
+distill_awk = $(srctree)/arch/x86/tools/distill.awk
+chkobjdump = $(srctree)/arch/x86/tools/chkobjdump.awk
+
 quiet_cmd_posttest = TEST    $@
-      cmd_posttest = $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(srctree)/arch/x86/tools/distill.awk | $(obj)/test_get_len $(posttest_64bit) $(posttest_verbose)
+      cmd_posttest = ($(OBJDUMP) -v | $(AWK) -f $(chkobjdump)) || $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(distill_awk) | $(obj)/test_get_len $(posttest_64bit) $(posttest_verbose)
 
 posttest: $(obj)/test_get_len vmlinux
 	$(call cmd,posttest)
arch/x86/tools/chkobjdump.awk new file +23 -0
new file mode 100644
index 0000000..0d13cd9
@@ -0,0 +1,23 @@
+# GNU objdump version checker
+#
+# Usage:
+# objdump -v | awk -f chkobjdump.awk
+BEGIN {
+	# objdump version 2.19 or later is OK for the test.
+	od_ver = 2;
+	od_sver = 19;
+}
+
+/^GNU/ {
+	split($4, ver, ".");
+	if (ver[1] > od_ver ||
+	    (ver[1] == od_ver && ver[2] >= od_sver)) {
+		exit 1;
+	} else {
+		printf("Warning: objdump version %s is older than %d.%d\n",
+		       $4, od_ver, od_sver);
+		print("Warning: Skipping posttest.");
+		# Logic is inverted, because we just skip test without error.
+		exit 0;
+	}
+}
Signature · 7 lines
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: [email protected]
#14 lore raw

[tip:perf/probes] x86: insn decoder test checks objdump version

Commit-ID:  6f5f67267dc4faecd9cba63894de92ca92a608b8
Gitweb:     http://git.kernel.org/tip/6f5f67267dc4faecd9cba63894de92ca92a608b8
Author:     Masami Hiramatsu <[email protected]>
AuthorDate: Fri, 20 Nov 2009 12:13:14 -0500
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Fri, 20 Nov 2009 23:01:04 -0800

x86: insn decoder test checks objdump version

Check objdump version before using it for insn decoder build test, because some older objdump can't decode AVX code correctly.

Cc Ingo Molnar <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Jim Keniston <[email protected]>

LKML-Reference: <[email protected]>

---
 arch/x86/tools/Makefile       |    5 ++++-
 arch/x86/tools/chkobjdump.awk |   23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)
arch/x86/tools/Makefile +4 -1
index c80b079..f820826 100644
@@ -12,8 +12,11 @@ else
   posttest_64bit = -n
 endif
 
+distill_awk = $(srctree)/arch/x86/tools/distill.awk
+chkobjdump = $(srctree)/arch/x86/tools/chkobjdump.awk
+
 quiet_cmd_posttest = TEST    $@
-      cmd_posttest = $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(srctree)/arch/x86/tools/distill.awk | $(obj)/test_get_len $(posttest_64bit) $(posttest_verbose)
+      cmd_posttest = ($(OBJDUMP) -v | $(AWK) -f $(chkobjdump)) || $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(distill_awk) | $(obj)/test_get_len $(posttest_64bit) $(posttest_verbose)
 
 posttest: $(obj)/test_get_len vmlinux
 	$(call cmd,posttest)
arch/x86/tools/chkobjdump.awk new file +23 -0
new file mode 100644
index 0000000..0d13cd9
@@ -0,0 +1,23 @@
+# GNU objdump version checker
+#
+# Usage:
+# objdump -v | awk -f chkobjdump.awk
+BEGIN {
+	# objdump version 2.19 or later is OK for the test.
+	od_ver = 2;
+	od_sver = 19;
+}
+
+/^GNU/ {
+	split($4, ver, ".");
+	if (ver[1] > od_ver ||
+	    (ver[1] == od_ver && ver[2] >= od_sver)) {
+		exit 1;
+	} else {
+		printf("Warning: objdump version %s is older than %d.%d\n",
+		       $4, od_ver, od_sver);
+		print("Warning: Skipping posttest.");
+		# Logic is inverted, because we just skip test without error.
+		exit 0;
+	}
+}