From 276f4a9d8ccc777da2d6b9efb7b2f85418454644 Mon Sep 17 00:00:00 2001
From: Mark Janes <markjanes@swizzler.org>
Date: Wed, 1 Mar 2023 14:26:20 -0800
Subject: [PATCH] intel/dev: Print required workarounds with intel_dev_info

With the addition of workarounds, the output from this tool is more
verbose than some users will want.  Provide optional parameters for
enabling hwconfig and workaround details.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21639>
---
 src/intel/dev/gen_wa_helpers.py |  6 ++++-
 src/intel/dev/intel_dev_info.c  | 60 ++++++++++++++++++++++++++++++++++++++---
 2 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/src/intel/dev/gen_wa_helpers.py b/src/intel/dev/gen_wa_helpers.py
index 86143fc..682bf74 100644
--- a/src/intel/dev/gen_wa_helpers.py
+++ b/src/intel/dev/gen_wa_helpers.py
@@ -98,6 +98,11 @@ PRAGMA_POISON(INTEL_NEEDS_WA_${a})
     % endif
 % endfor
 
+#define INTEL_ALL_WA ${"\\\\"}
+% for wa_id in wa_def:
+  INTEL_WA(${wa_id}), ${"\\\\"}
+% endfor
+
 #ifdef __cplusplus
 }
 #endif
@@ -162,7 +167,6 @@ void intel_device_info_init_was(struct intel_device_info *devinfo)
          break;
    };
 }
-
 """)
 
 def stepping_enums(wa_def):
diff --git a/src/intel/dev/intel_dev_info.c b/src/intel/dev/intel_dev_info.c
index 36335df..9d10791 100644
--- a/src/intel/dev/intel_dev_info.c
+++ b/src/intel/dev/intel_dev_info.c
@@ -21,11 +21,12 @@
  * IN THE SOFTWARE.
  */
 
+#include <getopt.h>
+#include <inttypes.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
-#include <inttypes.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -90,13 +91,62 @@ print_regions_info(const struct intel_device_info *devinfo)
    }
 }
 
+#define INTEL_WA( X ) "WA_"#X
+static void
+print_wa_info(const struct intel_device_info *devinfo)
+{
+   static const char* all_wa[] = { INTEL_ALL_WA };
+   fprintf(stdout, "   required workarounds:\n");
+   for (enum intel_workaround_id id = 0; id < INTEL_WA_NUM; ++id) {
+      if (BITSET_TEST(devinfo->workarounds, id)) {
+         fprintf(stdout, "      %s\n", all_wa[id]);
+      }
+   }
+   fprintf(stdout, "\n");
+}
+#undef INTEL_WA
+
 int
 main(int argc, char *argv[])
 {
    drmDevicePtr devices[8];
-   int max_devices;
-   bool print_hwconfig = argc > 1 && strcmp(argv[1], "--hwconfig") == 0;
+   int max_devices, i;
+   char c;
+   bool help = false, print_hwconfig = false, all = false, print_workarounds = false;
+   const struct option opts[] = {
+      { "help",         no_argument,  (int *) &help,              true },
+      { "hwconfig",     no_argument,  (int *) &print_hwconfig,    true },
+      { "workarounds",  no_argument,  (int *) &print_workarounds, true },
+      { "all",          no_argument,  (int *) &all,               true },
+   };
+   while ((c = getopt_long(argc, argv, "ha", opts, &i)) != -1) {
+      switch (c) {
+      case 'h':
+         help = true;
+         break;
+      case 'a':
+         all = true;
+         break;
+      default:
+         break;
+      }
+   }
 
+   if (help) {
+      fprintf(stdout,
+              "Usage: intel_dev_info [OPTION]\n"
+              "Print device info for the current system.\n"
+              "      --help / h     display this help and exit\n"
+              "      --hwconfig     print the hwconfig table\n"
+              "      --workarounds  print the list of hardware workarounds for the system\n"
+              "      --all / -a     print all optional details\n");
+      exit(0);
+   }
+
+   if (all) {
+      print_workarounds = true;
+      print_hwconfig = true;
+   }
    max_devices = drmGetDevices2(0, devices, ARRAY_SIZE(devices));
    if (max_devices < 1)
       return error("Not device found");
@@ -175,6 +225,8 @@ main(int argc, char *argv[])
               devinfo.timestamp_frequency, 1000000000.0 / devinfo.timestamp_frequency);
 
       print_regions_info(&devinfo);
+      if (print_workarounds)
+         print_wa_info(&devinfo);
    }
 
    return EXIT_SUCCESS;
-- 
2.7.4