From bfa1163980e8e9c13b6d33784363c7d510229fa9 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 27 Nov 2020 18:37:19 -0500
Subject: [PATCH] pan/bi: Move modifier prints out of common code

These will get in the way of what we want and aren't used by the
disassembler.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8215>
---
 src/panfrost/bifrost/bi_print.c        | 48 ++++++++++++++++++++++++++
 src/panfrost/bifrost/bi_print.h        |  4 ---
 src/panfrost/bifrost/bi_print_common.c | 48 --------------------------
 src/panfrost/bifrost/bi_print_common.h |  4 ---
 4 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/src/panfrost/bifrost/bi_print.c b/src/panfrost/bifrost/bi_print.c
index 78bf455ca43..a0393c8a681 100644
--- a/src/panfrost/bifrost/bi_print.c
+++ b/src/panfrost/bifrost/bi_print.c
@@ -27,6 +27,54 @@
 #include "bi_print.h"
 #include "bi_print_common.h"
 
+static const char *
+bi_output_mod_name(enum bi_clamp mod)
+{
+        switch (mod) {
+        case BI_CLAMP_NONE: return "";
+        case BI_CLAMP_CLAMP_0_INF: return ".pos";
+        case BI_CLAMP_CLAMP_M1_1: return ".sat_signed";
+        case BI_CLAMP_CLAMP_0_1: return ".sat";
+        default: return "invalid";
+        }
+}
+
+static const char *
+bi_minmax_mode_name(enum bi_sem mod)
+{
+        switch (mod) {
+        case BI_SEM_NAN_SUPPRESS: return "";
+        case BI_SEM_NAN_PROPAGATE: return ".nan_wins";
+        case BI_SEM_C: return ".src1_wins";
+        case BI_SEM_INVERSE_C: return ".src0_wins";
+        default: return "invalid";
+        }
+}
+
+static const char *
+bi_round_mode_name(enum bi_round mod)
+{
+        switch (mod) {
+        case BI_ROUND_NONE: return "";
+        case BI_ROUND_RTP: return ".rtp";
+        case BI_ROUND_RTN: return ".rtn";
+        case BI_ROUND_RTZ: return ".rtz";
+        default: return "invalid";
+        }
+}
+
+static const char *
+bi_interp_mode_name(enum bi_sample mode)
+{
+        switch (mode) {
+        case BI_SAMPLE_CENTER: return ".center";
+        case BI_SAMPLE_CENTROID: return ".centroid";
+        case BI_SAMPLE_SAMPLE: return ".sample";
+        case BI_SAMPLE_EXPLICIT: return ".explicit";
+        default: return ".unknown";
+        }
+}
+
 static const char *
 bi_seg_name(enum bi_seg seg)
 {
diff --git a/src/panfrost/bifrost/bi_print.h b/src/panfrost/bifrost/bi_print.h
index fbb15ae468d..6804877e688 100644
--- a/src/panfrost/bifrost/bi_print.h
+++ b/src/panfrost/bifrost/bi_print.h
@@ -32,10 +32,6 @@
 #include "compiler.h"
 
 const char * bi_message_type_name(enum bifrost_message_type T);
-const char * bi_output_mod_name(enum bi_clamp mod);
-const char * bi_minmax_mode_name(enum bi_sem mod);
-const char * bi_round_mode_name(enum bi_round mod);
-const char * bi_interp_mode_name(enum bi_sample mode);
 const char * bi_class_name(enum bi_class cl);
 const char * bi_cond_name(enum bi_cond cond);
 const char * bi_special_op_name(enum bi_special_op op);
diff --git a/src/panfrost/bifrost/bi_print_common.c b/src/panfrost/bifrost/bi_print_common.c
index 783110868d2..91589afa749 100644
--- a/src/panfrost/bifrost/bi_print_common.c
+++ b/src/panfrost/bifrost/bi_print_common.c
@@ -51,54 +51,6 @@ bi_message_type_name(enum bifrost_message_type T)
         }
 }
 
-const char *
-bi_output_mod_name(enum bi_clamp mod)
-{
-        switch (mod) {
-        case BI_CLAMP_NONE: return "";
-        case BI_CLAMP_CLAMP_0_INF: return ".pos";
-        case BI_CLAMP_CLAMP_M1_1: return ".sat_signed";
-        case BI_CLAMP_CLAMP_0_1: return ".sat";
-        default: return "invalid";
-        }
-}
-
-const char *
-bi_minmax_mode_name(enum bi_sem mod)
-{
-        switch (mod) {
-        case BI_SEM_NAN_SUPPRESS: return "";
-        case BI_SEM_NAN_PROPAGATE: return ".nan_wins";
-        case BI_SEM_C: return ".src1_wins";
-        case BI_SEM_INVERSE_C: return ".src0_wins";
-        default: return "invalid";
-        }
-}
-
-const char *
-bi_round_mode_name(enum bi_round mod)
-{
-        switch (mod) {
-        case BI_ROUND_NONE: return "";
-        case BI_ROUND_RTP: return ".rtp";
-        case BI_ROUND_RTN: return ".rtn";
-        case BI_ROUND_RTZ: return ".rtz";
-        default: return "invalid";
-        }
-}
-
-const char *
-bi_interp_mode_name(enum bi_sample mode)
-{
-        switch (mode) {
-        case BI_SAMPLE_CENTER: return ".center";
-        case BI_SAMPLE_CENTROID: return ".centroid";
-        case BI_SAMPLE_SAMPLE: return ".sample";
-        case BI_SAMPLE_EXPLICIT: return ".explicit";
-        default: return ".unknown";
-        }
-}
-
 const char *
 bi_flow_control_name(enum bifrost_flow mode)
 {
diff --git a/src/panfrost/bifrost/bi_print_common.h b/src/panfrost/bifrost/bi_print_common.h
index 4b7750fff7f..675738b389c 100644
--- a/src/panfrost/bifrost/bi_print_common.h
+++ b/src/panfrost/bifrost/bi_print_common.h
@@ -31,10 +31,6 @@
 #include "bifrost.h"
 
 const char * bi_message_type_name(enum bifrost_message_type T);
-const char * bi_output_mod_name(enum bi_clamp mod);
-const char * bi_minmax_mode_name(enum bi_sem mod);
-const char * bi_round_mode_name(enum bi_round mod);
-const char * bi_interp_mode_name(enum bi_sample mode);
 const char * bi_flow_control_name(enum bifrost_flow mode);
 
 #endif