commit 3173367a478217d2cee3400805756393a02d3dd1
author Jason Ekstrand <jason@jlekstrand.net> Wed Sep 23 15:54:34 2020 -0500
committer Marge Bot <eric+marge@anholt.net> Fri Sep 25 01:43:28 2020 +0000
tree 49131a7ceca46db69f8edf9e4a41280b1dc377e8
parent 03e7b75c22c0b3b55820be982ff9d98d704f3260

spirv: vtn_fail with a nice message on unsupported rounding modes

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6845>

src/compiler/spirv/spirv_info.h

diff --git a/src/compiler/spirv/spirv_info.h b/src/compiler/spirv/spirv_info.h
index 8b8b687..c9bfcda 100644
--- a/src/compiler/spirv/spirv_info.h
+++ b/src/compiler/spirv/spirv_info.h
@@ -38,5 +38,6 @@
 const char *spirv_memorymodel_to_string(SpvMemoryModel cap);
 const char *spirv_op_to_string(SpvOp op);
 const char *spirv_storageclass_to_string(SpvStorageClass sc);
+const char *spirv_fproundingmode_to_string(SpvFPRoundingMode sc);
 
 #endif /* SPIRV_INFO_H */

src/compiler/spirv/spirv_info_c.py

diff --git a/src/compiler/spirv/spirv_info_c.py b/src/compiler/spirv/spirv_info_c.py
index 29baec1..f1a1e27 100644
--- a/src/compiler/spirv/spirv_info_c.py
+++ b/src/compiler/spirv/spirv_info_c.py
@@ -124,6 +124,7 @@
         collect_data(spirv_info, "MemoryModel"),
         collect_data(spirv_info, "StorageClass"),
         collect_data(spirv_info, "ImageOperands"),
+        collect_data(spirv_info, "FPRoundingMode"),
         collect_opcodes(spirv_info),
     ]
 

src/compiler/spirv/vtn_alu.c

diff --git a/src/compiler/spirv/vtn_alu.c b/src/compiler/spirv/vtn_alu.c
index b403a25..6d64dd7 100644
--- a/src/compiler/spirv/vtn_alu.c
+++ b/src/compiler/spirv/vtn_alu.c
@@ -388,7 +388,8 @@
       *out_rounding_mode = nir_rounding_mode_rtz;
       break;
    default:
-      unreachable("Not supported rounding mode");
+      vtn_fail("Unsupported rounding mode: %s",
+               spirv_fproundingmode_to_string(dec->operands[0]));
       break;
    }
 }