panfrost: Use pack for Bifrost test state

[mesa.git] / src / panfrost / bifrost / cmdline.c

diff --git a/src/panfrost/bifrost/cmdline.c b/src/panfrost/bifrost/cmdline.c
index 7658c7cc3438dece521ab952e8407028d50b0d78..3668de5487d764c31452c232c26fd7e1ac99f7b1 100644 (file)
--- a/src/panfrost/bifrost/cmdline.c
+++ b/src/panfrost/bifrost/cmdline.c
@@ -30,9 +30,10 @@
 #include "compiler/nir_types.h"
 #include "util/u_dynarray.h"
 #include "bifrost_compile.h"
+#include "test/bit.h"
 
-static void
-compile_shader(char **argv)
+static panfrost_program
+compile_shader(char **argv, bool vertex_only)
 {
         struct gl_shader_program *prog;
         nir_shader *nir[2];
@@ -42,8 +43,9 @@ compile_shader(char **argv)
         };
 
         struct standalone_options options = {
-                .glsl_version = 430,
+                .glsl_version = 300, /* ES - needed for precision */
                 .do_link = true,
+                .lower_precision = true
         };
 
         static struct gl_context local_ctx;
@@ -51,10 +53,11 @@ compile_shader(char **argv)
         prog = standalone_compile_shader(&options, 2, argv, &local_ctx);
         prog->_LinkedShaders[MESA_SHADER_FRAGMENT]->Program->info.stage = MESA_SHADER_FRAGMENT;
 
-        bifrost_program compiled;
+        panfrost_program compiled;
         for (unsigned i = 0; i < 2; ++i) {
                 nir[i] = glsl_to_nir(&local_ctx, prog, shader_types[i], &bifrost_nir_options);
                 NIR_PASS_V(nir[i], nir_lower_global_vars_to_local);
+                NIR_PASS_V(nir[i], nir_lower_io_to_temporaries, nir_shader_get_entrypoint(nir[i]), true, i == 0);
                 NIR_PASS_V(nir[i], nir_split_var_copies);
                 NIR_PASS_V(nir[i], nir_lower_var_copies);
 
@@ -66,11 +69,16 @@ compile_shader(char **argv)
 
                 unsigned product_id = 0x7212; /* Mali G52 */
                 bifrost_compile_shader_nir(nir[i], &compiled, product_id);
+
+                if (vertex_only)
+                        return compiled;
         }
+
+        return compiled;
 }
 
 static void
-disassemble(const char *filename)
+disassemble(const char *filename, bool verbose)
 {
         FILE *fp = fopen(filename, "rb");
         assert(fp);
@@ -86,7 +94,72 @@ disassemble(const char *filename)
         }
         fclose(fp);
 
-        disassemble_bifrost(stdout, code, filesize, false);
+        disassemble_bifrost(stdout, code, filesize, verbose);
+        free(code);
+}
+
+static void
+test_vertex(char **argv)
+{
+        void *memctx = NULL; /* TODO */
+        struct panfrost_device *dev = bit_initialize(memctx);
+
+        float iubo[] = {
+                0.1, 0.2, 0.3, 0.4
+        };
+
+        float iattr[] = {
+                0.5, 0.6, 0.7, 0.8
+        };
+
+        float expected[] = {
+                0.6, 0.8, 1.0, 1.2
+        };
+
+        bit_vertex(dev, compile_shader(argv, true),
+                        (uint32_t *) iubo, sizeof(iubo),
+                        (uint32_t *) iattr, sizeof(iattr),
+                        (uint32_t *) expected, sizeof(expected),
+                        BIT_DEBUG_ALL);
+}
+
+static void
+tests(void)
+{
+        void *memctx = NULL; /* TODO */
+        struct panfrost_device *dev = bit_initialize(memctx);
+        bit_packing(dev, BIT_DEBUG_FAIL);
+}
+
+static void
+run(const char *filename)
+{
+        FILE *fp = fopen(filename, "rb");
+        assert(fp);
+
+        fseek(fp, 0, SEEK_END);
+        unsigned filesize = ftell(fp);
+        rewind(fp);
+
+        unsigned char *code = malloc(filesize);
+        unsigned res = fread(code, 1, filesize, fp);
+        if (res != filesize) {
+                printf("Couldn't read full file\n");
+        }
+        fclose(fp);
+
+        void *memctx = NULL; /* TODO */
+        struct panfrost_device *dev = bit_initialize(memctx);
+
+        panfrost_program prog = {
+                .compiled = {
+                        .data = code,
+                        .size = filesize
+                },
+        };
+
+        bit_vertex(dev, prog, NULL, 0, NULL, 0, NULL, 0, BIT_DEBUG_ALL);
+
         free(code);
 }
 
@@ -99,9 +172,17 @@ main(int argc, char **argv)
         }
 
         if (strcmp(argv[1], "compile") == 0)
-                compile_shader(&argv[2]);
+                compile_shader(&argv[2], false);
         else if (strcmp(argv[1], "disasm") == 0)
-                disassemble(argv[2]);
+                disassemble(argv[2], false);
+        else if (strcmp(argv[1], "disasm-verbose") == 0)
+                disassemble(argv[2], true);
+        else if (strcmp(argv[1], "tests") == 0)
+                tests();
+        else if (strcmp(argv[1], "test-vertex") == 0)
+                test_vertex(&argv[2]);
+        else if (strcmp(argv[1], "run") == 0)
+                run(argv[2]);
         else
                 unreachable("Unknown command. Valid: compile/disasm");