pan/bi: Use canonical min/max semantics

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8213>

diff --git a/src/panfrost/bifrost/bi_print.h b/src/panfrost/bifrost/bi_print.h
index 4987330..fbb15ae 100644 (file)
--- a/src/panfrost/bifrost/bi_print.h
+++ b/src/panfrost/bifrost/bi_print.h
@@ -33,7 +33,7 @@
 
 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 bifrost_minmax_mode 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);

diff --git a/src/panfrost/bifrost/bi_print_common.c b/src/panfrost/bifrost/bi_print_common.c
index 8a6ef76..7831108 100644 (file)
--- a/src/panfrost/bifrost/bi_print_common.c
+++ b/src/panfrost/bifrost/bi_print_common.c
@@ -64,13 +64,13 @@ bi_output_mod_name(enum bi_clamp mod)
 }
 
 const char *
-bi_minmax_mode_name(enum bifrost_minmax_mode mod)
+bi_minmax_mode_name(enum bi_sem mod)
 {
         switch (mod) {
-        case BIFROST_MINMAX_NONE: return "";
-        case BIFROST_NAN_WINS: return ".nan_wins";
-        case BIFROST_SRC1_WINS: return ".src1_wins";
-        case BIFROST_SRC0_WINS: return ".src0_wins";
+        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";
         }
 }

diff --git a/src/panfrost/bifrost/bi_print_common.h b/src/panfrost/bifrost/bi_print_common.h
index f263bb2..4b7750f 100644 (file)
--- a/src/panfrost/bifrost/bi_print_common.h
+++ b/src/panfrost/bifrost/bi_print_common.h
@@ -32,7 +32,7 @@
 
 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 bifrost_minmax_mode 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);

diff --git a/src/panfrost/bifrost/bifrost.h b/src/panfrost/bifrost/bifrost.h
index 22e75ff..ea294f4 100644 (file)
--- a/src/panfrost/bifrost/bifrost.h
+++ b/src/panfrost/bifrost/bifrost.h
@@ -215,11 +215,11 @@ enum bi_round {
  */
 
 
-enum bifrost_minmax_mode {
-        BIFROST_MINMAX_NONE = 0x0,
-        BIFROST_NAN_WINS    = 0x1,
-        BIFROST_SRC1_WINS   = 0x2,
-        BIFROST_SRC0_WINS   = 0x3,
+enum bi_sem {
+        BI_SEM_NAN_SUPPRESS = 0x0,
+        BI_SEM_NAN_PROPAGATE    = 0x1,
+        BI_SEM_C   = 0x2,
+        BI_SEM_INVERSE_C   = 0x3,
 };
 
 enum bi_sample {

diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h
index 2c1e65d..0f3a2b0 100644 (file)
--- a/src/panfrost/bifrost/compiler.h
+++ b/src/panfrost/bifrost/compiler.h
@@ -400,7 +400,7 @@ typedef struct {
 
         /* Union for class-specific information */
         union {
-                enum bifrost_minmax_mode minmax;
+                enum bi_sem minmax;
                 struct bi_load_vary load_vary;
                 struct bi_block *branch_target;