isaspec: decode: Add libisaspec

Create a static library that just contains isa_print(..). We
need to do this step to make lto happy.

Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28176>

src/compiler/isaspec/isaspec.c

@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2020 Google, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "isaspec.h"
+
+#include <stdarg.h>
+#include <stdlib.h>
+
+#include "util/u_string.h"
+
+void
+isa_print(struct isa_print_state *state, const char *fmt, ...)
+{
+	char *buffer;
+	va_list args;
+	int ret;
+
+	va_start(args, fmt);
+	ret = vasprintf(&buffer, fmt, args);
+	va_end(args);
+
+	if (ret != -1) {
+		const size_t len = strlen(buffer);
+
+		for (size_t i = 0; i < len; i++) {
+			const char c = buffer[i];
+
+			fputc(c, state->out);
+			state->line_column++;
+
+			if (c == '\n') {
+				state->line_column = 0;
+			}
+		}
+
+		free(buffer);
+
+		return;
+	}
+}

src/compiler/isaspec/isaspec_decode_impl.c

@@ -176,37 +176,6 @@ struct decode_state {
 	char *errors[4];
 };
 
-void
-isa_print(struct isa_print_state *state, const char *fmt, ...)
-{
-	char *buffer;
-	va_list args;
-	int ret;
-
-	va_start(args, fmt);
-	ret = vasprintf(&buffer, fmt, args);
-	va_end(args);
-
-	if (ret != -1) {
-		const size_t len = strlen(buffer);
-
-		for (size_t i = 0; i < len; i++) {
-			const char c = buffer[i];
-
-			fputc(c, state->out);
-			state->line_column++;
-
-			if (c == '\n') {
-				state->line_column = 0;
-			}
-		}
-
-		free(buffer);
-
-		return;
-	}
-}
-
 static void display(struct decode_scope *scope);
 static void decode_error(struct decode_state *state, const char *fmt, ...) _util_printf_format(2,3);
 

src/compiler/isaspec/meson.build

@@ -24,3 +24,10 @@ idep_isaspec_decode = declare_dependency(include_directories : include_directori
 prog_isaspec_encode = find_program('encode.py')
 
 isaspec_py_deps = files('isa.py')
+
+libisaspec = static_library(
+  'isaspec',
+  ['isaspec.c'],
+  dependencies: [idep_mesautil],
+  gnu_symbol_visibility: 'hidden',
+)

src/etnaviv/isa/meson.build

@@ -28,6 +28,7 @@ _libetnaviv_decode = static_library(
   'etnaviv_decode',
   decode_files,
   dependencies: [idep_mesautil, idep_isaspec_decode],
+  link_with: [libisaspec],
   include_directories: [
     inc_include,
     inc_src,

src/freedreno/afuc/meson.build

@@ -126,6 +126,7 @@ if cc.sizeof('size_t') > 4
     ],
     link_with: [
       libfreedreno_rnn,
+      libisaspec
     ],
     dependencies: [idep_mesautil, idep_isaspec_decode],
     build_by_default : with_tools.contains('freedreno'),

src/freedreno/isa/meson.build

@@ -51,6 +51,7 @@ _libir3decode = static_library(
   'ir3decode',
   decode_files,
   dependencies: [idep_mesautil, idep_isaspec_decode],
+  link_with: [libisaspec],
   include_directories: [
     inc_include,
     inc_src,