Skip to contentSkip to conversation

intel_reg_read: add support for getopt

PATCH In review Eugeni Dodonov 2 participants 7 messages Feb 28, 2012 – Feb 29, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 intel_reg_read: add support for getopt

This will allow us to pass more options to it in the future.

---
 tools/intel_reg_read.c |   44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)
tools/intel_reg_read.c +35 -9
index cad30ff..c3e559b 100644
@@ -41,21 +41,45 @@ static void dump_range(uint32_t start, uint32_t end)
 		       *(volatile uint32_t *)((volatile char*)mmio + i));
 }
 
+static void usage(char *cmdname)
+{
+	printf("Usage: %s [-f | addr]\n", cmdname);
+	printf("\t -f : read back full range of registers.\n");
+	printf("\t      WARNING! This could be danger to hang the machine!\n");
+	printf("\t addr : in 0xXXXX format\n");
+}
+
 int main(int argc, char** argv)
 {
+	int ret=0;
 	uint32_t reg;
+	int ch;
+	char *cmdname = strdup(argv[0]);
+	int full_dump=0;
+
+	while ((ch = getopt(argc, argv, "fh")) != -1) {
+		switch(ch) {
+		case 'f':
+			full_dump=1;
+			  break;
+		case 'h':
+			  usage(cmdname);
+			  ret=1;
+			  goto out;
+		}
+	}
+	argc -= optind;
+	argv += optind;
 
-	if (argc != 2) {
-		printf("Usage: %s [-f | addr]\n", argv[0]);
-		printf("\t -f : read back full range of registers.\n");
-		printf("\t      WARNING! This could be danger to hang the machine!\n");
-		printf("\t addr : in 0xXXXX format\n");
-		exit(1);
+	if (argc != 1) {
+		usage(cmdname);
+		ret=1;
+		goto out;
 	}
 
 	intel_register_access_init(intel_get_pci_device(), 0);
 
-	if (!strcmp(argv[1], "-f")) {
+	if (full_dump) {
 		dump_range(0x00000, 0x00fff);   /* VGA registers */
 		dump_range(0x02000, 0x02fff);   /* instruction, memory, interrupt control registers */
 		dump_range(0x03000, 0x031ff);   /* FENCE and PPGTT control registers */
@@ -71,12 +95,14 @@ int main(int argc, char** argv)
 		dump_range(0x70000, 0x72fff);   /* display and cursor registers */
 		dump_range(0x73000, 0x73fff);   /* performance counters */
 	} else {
-		sscanf(argv[1], "0x%x", &reg);
+		sscanf(argv[0], "0x%x", &reg);
 		dump_range(reg, reg + 4);
 	}
 
 	intel_register_access_fini();
 
-	return 0;
+out:
+	free(cmdname);
+	return ret;
 }
 
Signature · 1 line
1.7.9.2
#1 lore raw

PATCH 1/3 intel_reg_read: add support for getopt

This will allow us to pass more options to it in the future.

v2: fix whitespacing issues and improve scary warning text as suggested by Paul Menzel.

---
 tools/intel_reg_read.c |   44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)
tools/intel_reg_read.c +35 -9
index cad30ff..95d28c5 100644
@@ -41,21 +41,45 @@ static void dump_range(uint32_t start, uint32_t end)
 		       *(volatile uint32_t *)((volatile char*)mmio + i));
 }
 
+static void usage(char *cmdname)
+{
+	printf("Usage: %s [-f | addr]\n", cmdname);
+	printf("\t -f : read back full range of registers.\n");
+	printf("\t      WARNING! This option may result in a machine hang!\n");
+	printf("\t addr : in 0xXXXX format\n");
+}
+
 int main(int argc, char** argv)
 {
+	int ret = 0;
 	uint32_t reg;
+	int ch;
+	char *cmdname = strdup(argv[0]);
+	int full_dump = 0;
+
+	while ((ch = getopt(argc, argv, "fh")) != -1) {
+		switch(ch) {
+		case 'f':
+			full_dump = 1;
+			break;
+		case 'h':
+			usage(cmdname);
+			ret = 1;
+			goto out;
+		}
+	}
+	argc -= optind;
+	argv += optind;
 
-	if (argc != 2) {
-		printf("Usage: %s [-f | addr]\n", argv[0]);
-		printf("\t -f : read back full range of registers.\n");
-		printf("\t      WARNING! This could be danger to hang the machine!\n");
-		printf("\t addr : in 0xXXXX format\n");
-		exit(1);
+	if (argc != 1) {
+		usage(cmdname);
+		ret = 1;
+		goto out;
 	}
 
 	intel_register_access_init(intel_get_pci_device(), 0);
 
-	if (!strcmp(argv[1], "-f")) {
+	if (full_dump) {
 		dump_range(0x00000, 0x00fff);   /* VGA registers */
 		dump_range(0x02000, 0x02fff);   /* instruction, memory, interrupt control registers */
 		dump_range(0x03000, 0x031ff);   /* FENCE and PPGTT control registers */
@@ -71,12 +95,14 @@ int main(int argc, char** argv)
 		dump_range(0x70000, 0x72fff);   /* display and cursor registers */
 		dump_range(0x73000, 0x73fff);   /* performance counters */
 	} else {
-		sscanf(argv[1], "0x%x", &reg);
+		sscanf(argv[0], "0x%x", &reg);
 		dump_range(reg, reg + 4);
 	}
 
 	intel_register_access_fini();
 
-	return 0;
+out:
+	free(cmdname);
+	return ret;
 }
 
Signature · 1 line
1.7.9.2
#2 lore raw

PATCH 2/3 intel_reg_read: support reading multiple registers

The registers must be passed on the command line and will be read sequentially, one at a time.

---
 tools/intel_reg_read.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
tools/intel_reg_read.c +7 -5
index 95d28c5..5f94fed 100644
@@ -43,7 +43,7 @@ static void dump_range(uint32_t start, uint32_t end)
 
 static void usage(char *cmdname)
 {
-	printf("Usage: %s [-f | addr]\n", cmdname);
+	printf("Usage: %s [-f] [addr1] [addr2] .. [addrN]\n", cmdname);
 	printf("\t -f : read back full range of registers.\n");
 	printf("\t      WARNING! This option may result in a machine hang!\n");
 	printf("\t addr : in 0xXXXX format\n");
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
 {
 	int ret = 0;
 	uint32_t reg;
-	int ch;
+	int i, ch;
 	char *cmdname = strdup(argv[0]);
 	int full_dump = 0;
 
@@ -71,7 +71,7 @@ int main(int argc, char** argv)
 	argc -= optind;
 	argv += optind;
 
-	if (argc != 1) {
+	if (argc < 1) {
 		usage(cmdname);
 		ret = 1;
 		goto out;
@@ -95,8 +95,10 @@ int main(int argc, char** argv)
 		dump_range(0x70000, 0x72fff);   /* display and cursor registers */
 		dump_range(0x73000, 0x73fff);   /* performance counters */
 	} else {
-		sscanf(argv[0], "0x%x", &reg);
-		dump_range(reg, reg + 4);
+		for (i=0; i < argc; i++) {
+			sscanf(argv[i], "0x%x", &reg);
+			dump_range(reg, reg + 4);
+		}
 	}
 
 	intel_register_access_fini();
Signature · 1 line
1.7.9.2
#3 lore raw

PATCH 3/3 intel_reg_read: add a flag to simplify bit decoding

In reply to Eugeni Dodonov

This allows to specify '-d' parameter which will decode individual bits in each register being read.

The register bits are printed horizontally for space reasons. This requires more than 80x25 terminal to see them all. An alternative solution would be to print them vertically, but this will become much more difficult to read when printing multiple registers at the same time.

v2: fix spacing to get us a bit closer to the code nirvana.

---
 tools/intel_reg_read.c |   25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)
tools/intel_reg_read.c +23 -2
index 5f94fed..6187a4b 100644
@@ -32,6 +32,19 @@
 #include <string.h>
 #include "intel_gpu_tools.h"
 
+static void bit_decode(uint32_t reg)
+{
+	int i;
+
+	for (i=31; i >= 0; i--)
+		printf(" %2d", i);
+	printf("\n");
+
+	for (i=31; i >= 0; i--)
+		printf(" %2d", (reg & (1 << i)) && 1);
+	printf("\n");
+}
+
 static void dump_range(uint32_t start, uint32_t end)
 {
 	int i;
@@ -43,9 +56,10 @@ static void dump_range(uint32_t start, uint32_t end)
 
 static void usage(char *cmdname)
 {
-	printf("Usage: %s [-f] [addr1] [addr2] .. [addrN]\n", cmdname);
+	printf("Usage: %s [-f|-d] [addr1] [addr2] .. [addrN]\n", cmdname);
 	printf("\t -f : read back full range of registers.\n");
 	printf("\t      WARNING! This option may result in a machine hang!\n");
+	printf("\t -d : decode register bits.\n");
 	printf("\t addr : in 0xXXXX format\n");
 }
 
@@ -56,9 +70,13 @@ int main(int argc, char** argv)
 	int i, ch;
 	char *cmdname = strdup(argv[0]);
 	int full_dump = 0;
+	int decode_bits = 0;
 
-	while ((ch = getopt(argc, argv, "fh")) != -1) {
+	while ((ch = getopt(argc, argv, "dfh")) != -1) {
 		switch(ch) {
+		case 'd':
+			decode_bits = 1;
+			break;
 		case 'f':
 			full_dump = 1;
 			break;
@@ -98,6 +116,9 @@ int main(int argc, char** argv)
 		for (i=0; i < argc; i++) {
 			sscanf(argv[i], "0x%x", &reg);
 			dump_range(reg, reg + 4);
+
+			if (decode_bits)
+				bit_decode(*(volatile uint32_t *)((volatile char*)mmio + reg));
 		}
 	}
 
Signature · 1 line
1.7.9.2
#4 lore raw

PATCH 2/3 intel_reg_read: support reading multiple registers

In reply to Eugeni Dodonov

The registers must be passed on the command line and will be read sequentially, one at a time.

---
 tools/intel_reg_read.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
tools/intel_reg_read.c +7 -5
index c3e559b..50b3d39 100644
@@ -43,7 +43,7 @@ static void dump_range(uint32_t start, uint32_t end)
 
 static void usage(char *cmdname)
 {
-	printf("Usage: %s [-f | addr]\n", cmdname);
+	printf("Usage: %s [-f] [addr1] [addr2] .. [addrN]\n", cmdname);
 	printf("\t -f : read back full range of registers.\n");
 	printf("\t      WARNING! This could be danger to hang the machine!\n");
 	printf("\t addr : in 0xXXXX format\n");
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
 {
 	int ret=0;
 	uint32_t reg;
-	int ch;
+	int i, ch;
 	char *cmdname = strdup(argv[0]);
 	int full_dump=0;
 
@@ -71,7 +71,7 @@ int main(int argc, char** argv)
 	argc -= optind;
 	argv += optind;
 
-	if (argc != 1) {
+	if (argc < 1) {
 		usage(cmdname);
 		ret=1;
 		goto out;
@@ -95,8 +95,10 @@ int main(int argc, char** argv)
 		dump_range(0x70000, 0x72fff);   /* display and cursor registers */
 		dump_range(0x73000, 0x73fff);   /* performance counters */
 	} else {
-		sscanf(argv[0], "0x%x", &reg);
-		dump_range(reg, reg + 4);
+		for (i=0; i < argc; i++) {
+			sscanf(argv[i], "0x%x", &reg);
+			dump_range(reg, reg + 4);
+		}
 	}
 
 	intel_register_access_fini();
Signature · 1 line
1.7.9.2
Reviewed-by on v1 1/3
#5 lore raw
In reply to Eugeni Dodonov

Dear Eugeni,

Am Dienstag, den 28.02.2012, 17:55 -0300 schrieb Eugeni Dodonov:

Quoted 12 lines

This will allow us to pass more options to it in the future.

---
 tools/intel_reg_read.c |   44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)
tools/intel_reg_read.c +0 -0
index cad30ff..c3e559b 100644

tools/intel_reg_read.c static void dump_range(uint32_t start, uint32_t end) · line 48

Quoted 8 lines
tools/intel_reg_read.c +5 -0
@@ -41,21 +41,45 @@ static void dump_range(uint32_t start, uint32_t end)
 		       *(volatile uint32_t *)((volatile char*)mmio + i));
 }
 
+static void usage(char *cmdname)
+{
+	printf("Usage: %s [-f | addr]\n", cmdname);
+	printf("\t -f : read back full range of registers.\n");
+	printf("\t      WARNING! This could be danger to hang the machine!\n");

I know you just copied this sentence, but could a native English speaker proof read it? It sounds strange to me.

tools/intel_reg_read.c static void dump_range(uint32_t start, uint32_t end) · line 54

Quoted 6 lines
tools/intel_reg_read.c +4 -0
+	printf("\t addr : in 0xXXXX format\n");
+}
+
 int main(int argc, char** argv)
 {
+	int ret=0;

Coding style seems to differ, does not it? There are some occurrences where = does have spaces around. Care to send a patch cleaning that up beforehand?

tools/intel_reg_read.c static void dump_range(uint32_t start, uint32_t end) · line 60

Quoted 6 lines
tools/intel_reg_read.c +5 -0
 	uint32_t reg;
+	int ch;
+	char *cmdname = strdup(argv[0]);
+	int full_dump=0;
+
+	while ((ch = getopt(argc, argv, "fh")) != -1) {

I did not check further. But I guess no headers need to be included for getopt.

tools/intel_reg_read.c static void dump_range(uint32_t start, uint32_t end) · line 64

Quoted 4 lines
tools/intel_reg_read.c +4 -0
+		switch(ch) {
+		case 'f':
+			full_dump=1;
+			  break;

Indentation seems to differ in the line full_dump = 1.

Quoted 34 lines
tools/intel_reg_read.c +14 -8
+		case 'h':
+			  usage(cmdname);
+			  ret=1;
+			  goto out;
+		}
+	}
+	argc -= optind;
+	argv += optind;
 
-	if (argc != 2) {
-		printf("Usage: %s [-f | addr]\n", argv[0]);
-		printf("\t -f : read back full range of registers.\n");
-		printf("\t      WARNING! This could be danger to hang the machine!\n");
-		printf("\t addr : in 0xXXXX format\n");
-		exit(1);
+	if (argc != 1) {
+		usage(cmdname);
+		ret=1;
+		goto out;
 	}
 
 	intel_register_access_init(intel_get_pci_device(), 0);
 
-	if (!strcmp(argv[1], "-f")) {
+	if (full_dump) {
 		dump_range(0x00000, 0x00fff);   /* VGA registers */
 		dump_range(0x02000, 0x02fff);   /* instruction, memory, interrupt control registers */
 		dump_range(0x03000, 0x031ff);   /* FENCE and PPGTT control registers */
@@ -71,12 +95,14 @@ int main(int argc, char** argv)
 		dump_range(0x70000, 0x72fff);   /* display and cursor registers */
 		dump_range(0x73000, 0x73fff);   /* performance counters */
 	} else {
-		sscanf(argv[1], "0x%x", &reg);
+		sscanf(argv[0], "0x%x", &reg);

tools/intel_reg_read.c int main(int argc, char** argv) · line 107

Quoted 10 lines
tools/intel_reg_read.c +3 -1
 		dump_range(reg, reg + 4);
 	}
 
 	intel_register_access_fini();
 
-	return 0;
+out:
+	free(cmdname);
+	return ret;
 }

Otherwise you can add

Thanks,

Paul

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

PATCH 3/3 intel_reg_read: add a flag to simplify bit decoding

In reply to Eugeni Dodonov

This allows to specify '-d' parameter which will decode individual bits in each register being read.

The register bits are printed horizontally for space reasons. This requires more than 80x25 terminal to see them all. An alternative solution would be to print them vertically, but this will become much more difficult to read when printing multiple registers at the same time.

---
 tools/intel_reg_read.c |   25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)
tools/intel_reg_read.c +23 -2
index 50b3d39..8abe3b5 100644
@@ -32,6 +32,19 @@
 #include <string.h>
 #include "intel_gpu_tools.h"
 
+static void bit_decode(uint32_t reg)
+{
+	int i;
+
+	for (i=31; i >= 0; i--)
+		printf(" %2d", i);
+	printf("\n");
+
+	for (i=31; i >= 0; i--)
+		printf(" %2d", (reg & (1 << i)) && 1);
+	printf("\n");
+}
+
 static void dump_range(uint32_t start, uint32_t end)
 {
 	int i;
@@ -43,9 +56,10 @@ static void dump_range(uint32_t start, uint32_t end)
 
 static void usage(char *cmdname)
 {
-	printf("Usage: %s [-f] [addr1] [addr2] .. [addrN]\n", cmdname);
+	printf("Usage: %s [-f|-d] [addr1] [addr2] .. [addrN]\n", cmdname);
 	printf("\t -f : read back full range of registers.\n");
 	printf("\t      WARNING! This could be danger to hang the machine!\n");
+	printf("\t -d : decode register bits.\n");
 	printf("\t addr : in 0xXXXX format\n");
 }
 
@@ -56,9 +70,13 @@ int main(int argc, char** argv)
 	int i, ch;
 	char *cmdname = strdup(argv[0]);
 	int full_dump=0;
+	int decode_bits=0;
 
-	while ((ch = getopt(argc, argv, "fh")) != -1) {
+	while ((ch = getopt(argc, argv, "dfh")) != -1) {
 		switch(ch) {
+		case 'd':
+			decode_bits=1;
+			  break;
 		case 'f':
 			full_dump=1;
 			  break;
@@ -98,6 +116,9 @@ int main(int argc, char** argv)
 		for (i=0; i < argc; i++) {
 			sscanf(argv[i], "0x%x", &reg);
 			dump_range(reg, reg + 4);
+
+			if (decode_bits)
+				bit_decode(*(volatile uint32_t *)((volatile char*)mmio + reg));
 		}
 	}
 
Signature · 1 line
1.7.9.2