From aa649dfa5fff474114139313e517dcb3092c4700 Mon Sep 17 00:00:00 2001
From: Mark Janes <markjanes@swizzler.org>
Date: Fri, 9 Feb 2024 16:43:48 -0800
Subject: [PATCH] intel/tools: move intel_dev_info to intel/tools

This is a more sensible home for intel_dev_info.

Offline shader compilation will take intel_dev_info json files as
input.  For that use case, the shader compiler hash value is needed in
the json file.

intel_dev_info will depend on intel/compiler, and must be located in
intel/tools to break a circular meson dependency.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26844>
---
 src/intel/dev/meson.build                 | 12 ------------
 src/intel/{dev => tools}/intel_dev_info.c |  6 +++---
 src/intel/tools/meson.build               | 12 ++++++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)
 rename src/intel/{dev => tools}/intel_dev_info.c (98%)

diff --git a/src/intel/dev/meson.build b/src/intel/dev/meson.build
index 5635e03d813..a014ee2ab8e 100644
--- a/src/intel/dev/meson.build
+++ b/src/intel/dev/meson.build
@@ -117,15 +117,3 @@ if with_tests and with_tools.contains('drm-shim') and with_tools.contains('intel
     endforeach
   endforeach
 endif
-
-if with_intel_tools
-  intel_dev_info = executable(
-    'intel_dev_info',
-    [files('intel_dev_info.c'), [intel_dev_serialize_src]],
-    dependencies : [dep_libdrm, dep_dl, dep_thread, dep_m, idep_intel_dev, idep_parson],
-    include_directories : [inc_include, inc_src, inc_intel],
-    c_args : [no_override_init_args],
-    gnu_symbol_visibility : 'hidden',
-    install : true
-  )
-endif
diff --git a/src/intel/dev/intel_dev_info.c b/src/intel/tools/intel_dev_info.c
similarity index 98%
rename from src/intel/dev/intel_dev_info.c
rename to src/intel/tools/intel_dev_info.c
index 40c76a321c1..6bbca5c495e 100644
--- a/src/intel/dev/intel_dev_info.c
+++ b/src/intel/tools/intel_dev_info.c
@@ -35,9 +35,9 @@
 
 #include "util/libdrm.h"
 
-#include "intel_device_info.h"
-#include "intel_device_info_serialize.h"
-#include "intel_hwconfig.h"
+#include "dev/intel_device_info.h"
+#include "dev/intel_device_info_serialize.h"
+#include "dev/intel_hwconfig.h"
 
 static int
 error(char *fmt, ...)
diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build
index a48c8156fb0..d84609b4b71 100644
--- a/src/intel/tools/meson.build
+++ b/src/intel/tools/meson.build
@@ -180,3 +180,15 @@ if with_tools.contains('intel-ui')
     install : true
   )
 endif
+
+if with_intel_tools
+  intel_dev_info = executable(
+    'intel_dev_info',
+    [files('intel_dev_info.c'), [intel_dev_serialize_src]],
+    dependencies : [dep_libdrm, dep_dl, dep_thread, dep_m, idep_intel_dev, idep_parson],
+    include_directories : [inc_include, inc_src, inc_intel],
+    c_args : [no_override_init_args],
+    gnu_symbol_visibility : 'hidden',
+    install : true
+  )
+endif