panfrost: Rename encoder/ to lib/

[mesa.git] / src / panfrost / bifrost / test / bi_submit.c

diff --git a/src/panfrost/bifrost/test/bi_submit.c b/src/panfrost/bifrost/test/bi_submit.c
index 17b7a3600cd4e8417ca34b1a7ebd17b87d13a34f..38539c09cbc827ef7b41d0682919525dfb861762 100644 (file)
--- a/src/panfrost/bifrost/test/bi_submit.c
+++ b/src/panfrost/bifrost/test/bi_submit.c
@@ -25,7 +25,7 @@
  */
 
 #include "bit.h"
-#include "panfrost/pandecode/decode.h"
+#include "panfrost/lib/decode.h"
 #include "drm-uapi/panfrost_drm.h"
 #include "panfrost/encoder/pan_encoder.h"
 
@@ -61,7 +61,7 @@ static bool
 bit_submit(struct panfrost_device *dev,
                 enum mali_job_type T,
                 void *payload, size_t payload_size,
-                struct panfrost_bo **bos, size_t bo_count, bool trace)
+                struct panfrost_bo **bos, size_t bo_count, enum bit_debug debug)
 {
         struct mali_job_descriptor_header header = {
                 .job_descriptor_size = MALI_JOB_64,
@@ -96,7 +96,7 @@ bit_submit(struct panfrost_device *dev,
         free(bo_handles);
 
         drmSyncobjWait(dev->fd, &syncobj, 1, INT64_MAX, 0, NULL);
-        if (trace)
+        if (debug >= BIT_DEBUG_ALL)
                 pandecode_jc(submit.jc, true, dev->gpu_id, false);
         return true;
 }
@@ -126,7 +126,10 @@ bit_sanity_check(struct panfrost_device *dev)
 /* Constructs a vertex job */
 
 bool
-bit_vertex(struct panfrost_device *dev, panfrost_program prog)
+bit_vertex(struct panfrost_device *dev, panfrost_program prog,
+                uint32_t *iubo, size_t sz_ubo,
+                uint32_t *iattr, size_t sz_attr,
+                uint32_t *expected, size_t sz_expected, enum bit_debug debug)
 {
 
         struct panfrost_bo *scratchpad = bit_bo_create(dev, 4096);
@@ -138,7 +141,7 @@ bit_vertex(struct panfrost_device *dev, panfrost_program prog)
 
         struct mali_attr_meta vmeta = {
                 .index = 0,
-                .format = MALI_RGBA32F
+                .format = MALI_RGBA32UI
         };
 
         union mali_attr vary = {
@@ -155,12 +158,17 @@ bit_vertex(struct panfrost_device *dev, panfrost_program prog)
 
         memcpy(ubo->cpu, &my_ubo, sizeof(my_ubo));
         memcpy(var->cpu, &vmeta, sizeof(vmeta));
+
+        vmeta.unknown1 = 0x2; /* XXX: only attrib? */
         memcpy(attr->cpu, &vmeta, sizeof(vmeta));
         memcpy(var->cpu + 256, &vary, sizeof(vary));
         memcpy(attr->cpu + 256, &attr_, sizeof(vary));
 
-        float *fvaryings = (float *) (var->cpu + 1024);
-        float *fubo = (float *) (ubo->cpu + 1024);
+        if (sz_ubo)
+                memcpy(ubo->cpu + 1024, iubo, sz_ubo);
+
+        if (sz_attr)
+                memcpy(attr->cpu + 1024, iattr, sz_attr);
 
         struct panfrost_bo *shmem = bit_bo_create(dev, 4096);
         struct mali_shared_memory shmemp = {
@@ -176,11 +184,12 @@ bit_vertex(struct panfrost_device *dev, panfrost_program prog)
                 .varying_count = 1,
                 .bifrost1 = {
                         .unk1 = 0x800200,
+                        .uniform_buffer_count = 1,
                 },
                 .bifrost2 = {
                         .unk3 = 0x0,
                         .preload_regs = 0xc0,
-                        .uniform_count = 0,
+                        .uniform_count = sz_ubo / 16,
                         .unk4 = 0x0,
                 },
         };
@@ -191,16 +200,14 @@ bit_vertex(struct panfrost_device *dev, panfrost_program prog)
         struct bifrost_payload_vertex payload = {
                 .prefix = {
                 },
-                .vertex = {
-                        .unk2 = 0x2,
-                },
                 .postfix = {
+                        .gl_enables = 0x2,
                         .shared_memory = shmem->gpu,
                         .shader = shader_desc->gpu,
                         .uniforms = ubo->gpu + 1024,
                         .uniform_buffers = ubo->gpu,
                         .attribute_meta = attr->gpu,
-                        .attributes = var->gpu + 256,
+                        .attributes = attr->gpu + 256,
                         .varying_meta = var->gpu,
                         .varyings = var->gpu + 256,
                 },
@@ -217,6 +224,40 @@ bit_vertex(struct panfrost_device *dev, panfrost_program prog)
                 scratchpad, shmem, shader, shader_desc, ubo, var, attr
         };
 
-        return bit_submit(dev, JOB_TYPE_VERTEX, &payload,
-                        sizeof(payload), bos, ARRAY_SIZE(bos), true);
+        bool succ = bit_submit(dev, JOB_TYPE_VERTEX, &payload,
+                        sizeof(payload), bos, ARRAY_SIZE(bos), debug);
+
+        /* Check the output varyings */
+
+        uint32_t *output = (uint32_t *) (var->cpu + 1024);
+        float *foutput = (float *) output;
+        float *fexpected = (float *) expected;
+
+        if (sz_expected) {
+                unsigned comp = memcmp(output, expected, sz_expected);
+                succ &= (comp == 0);
+
+                if (comp && (debug >= BIT_DEBUG_FAIL)) {
+                        fprintf(stderr, "expected [");
+
+                        for (unsigned i = 0; i < (sz_expected >> 2); ++i)
+                                fprintf(stderr, "%08X /* %f */ ", expected[i], fexpected[i]);
+
+                        fprintf(stderr, "], got [");
+
+                        for (unsigned i = 0; i < (sz_expected >> 2); ++i)
+                                fprintf(stderr, "%08X /* %f */ ", output[i], foutput[i]);
+
+                        fprintf(stderr, "\n");
+                }
+        } else if (debug == BIT_DEBUG_ALL) {
+                fprintf(stderr, "got [");
+
+                for (unsigned i = 0; i < 4; ++i)
+                        fprintf(stderr, "%08X /* %f */ ", output[i], foutput[i]);
+
+                fprintf(stderr, "\n");
+        }
+
+        return succ;
 }