gallivm: Support 4 x unorm8 in lp_build_fetch_rgba_aos().

Uses code and ideas from Brian Paul.

1 files changed, 159 insertions, 71 deletions

diff --git a/src/gallium/drivers/llvmpipe/lp_test_format.c b/src/gallium/drivers/llvmpipe/lp_test_format.c
index 8b6dc1c7f5..80d2c68617 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_format.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_format.c
@@ -31,6 +31,7 @@
 #include <float.h>
 
 #include "gallivm/lp_bld.h"
+#include "gallivm/lp_bld_debug.h"
 #include "gallivm/lp_bld_init.h"
 #include <llvm-c/Analysis.h>
 #include <llvm-c/Target.h>
@@ -38,6 +39,7 @@
 
 #include "util/u_memory.h"
 #include "util/u_pointer.h"
+#include "util/u_string.h"
 #include "util/u_format.h"
 #include "util/u_format_tests.h"
 #include "util/u_format_s3tc.h"
@@ -71,14 +73,16 @@ write_tsv_row(FILE *fp,
 
 
 typedef void
-(*fetch_ptr_t)(float *, const void *packed,
+(*fetch_ptr_t)(void *unpacked, const void *packed,
                unsigned i, unsigned j);
 
 
 static LLVMValueRef
-add_fetch_rgba_test(LLVMModuleRef lp_build_module,
-                    const struct util_format_description *desc)
+add_fetch_rgba_test(unsigned verbose,
+                    const struct util_format_description *desc,
+                    struct lp_type type)
 {
+   char name[256];
    LLVMTypeRef args[4];
    LLVMValueRef func;
    LLVMValueRef packed_ptr;
@@ -89,11 +93,15 @@ add_fetch_rgba_test(LLVMModuleRef lp_build_module,
    LLVMBuilderRef builder;
    LLVMValueRef rgba;
 
-   args[0] = LLVMPointerType(LLVMVectorType(LLVMFloatType(), 4), 0);
+   util_snprintf(name, sizeof name, "fetch_%s_%s", desc->short_name,
+                 type.floating ? "float" : "unorm8");
+
+   args[0] = LLVMPointerType(lp_build_vec_type(type), 0);
    args[1] = LLVMPointerType(LLVMInt8Type(), 0);
    args[3] = args[2] = LLVMInt32Type();
 
-   func = LLVMAddFunction(lp_build_module, "fetch", LLVMFunctionType(LLVMVoidType(), args, Elements(args), 0));
+   func = LLVMAddFunction(lp_build_module, name,
+                          LLVMFunctionType(LLVMVoidType(), args, Elements(args), 0));
    LLVMSetFunctionCallConv(func, LLVMCCallConv);
    rgba_ptr = LLVMGetParam(func, 0);
    packed_ptr = LLVMGetParam(func, 1);
@@ -104,91 +112,101 @@ add_fetch_rgba_test(LLVMModuleRef lp_build_module,
    builder = LLVMCreateBuilder();
    LLVMPositionBuilderAtEnd(builder, block);
 
-   rgba = lp_build_fetch_rgba_aos(builder, desc, packed_ptr, i, j);
+   rgba = lp_build_fetch_rgba_aos(builder, desc, type, packed_ptr, i, j);
 
    LLVMBuildStore(builder, rgba, rgba_ptr);
 
    LLVMBuildRetVoid(builder);
 
    LLVMDisposeBuilder(builder);
+
+   if (LLVMVerifyFunction(func, LLVMPrintMessageAction)) {
+      LLVMDumpValue(func);
+      abort();
+   }
+
+   LLVMRunFunctionPassManager(lp_build_pass, func);
+
+   if (verbose >= 1) {
+      LLVMDumpValue(func);
+   }
+
    return func;
 }
 
 
 PIPE_ALIGN_STACK
 static boolean
-test_format(unsigned verbose, FILE *fp,
-            const struct util_format_description *desc,
-            const struct util_format_test_case *test)
+test_format_float(unsigned verbose, FILE *fp,
+                  const struct util_format_description *desc)
 {
    LLVMValueRef fetch = NULL;
-   LLVMPassManagerRef pass = NULL;
    fetch_ptr_t fetch_ptr;
    PIPE_ALIGN_VAR(16) float unpacked[4];
-   boolean success;
-   unsigned i, j, k;
+   boolean first = TRUE;
+   boolean success = TRUE;
+   unsigned i, j, k, l;
 
-   fetch = add_fetch_rgba_test(lp_build_module, desc);
+   fetch = add_fetch_rgba_test(verbose, desc, lp_float32_vec4_type());
 
-   if (LLVMVerifyFunction(fetch, LLVMPrintMessageAction)) {
-      LLVMDumpValue(fetch);
-      abort();
+   fetch_ptr = (fetch_ptr_t)pointer_to_func(LLVMGetPointerToGlobal(lp_build_engine, fetch));
+
+   if (verbose >= 2) {
+      lp_disassemble(fetch_ptr);
    }
 
-#if 0
-   pass = LLVMCreatePassManager();
-   LLVMAddTargetData(LLVMGetExecutionEngineTargetData(lp_build_engine), pass);
-   /* These are the passes currently listed in llvm-c/Transforms/Scalar.h,
-    * but there are more on SVN. */
-   LLVMAddConstantPropagationPass(pass);
-   LLVMAddInstructionCombiningPass(pass);
-   LLVMAddPromoteMemoryToRegisterPass(pass);
-   LLVMAddGVNPass(pass);
-   LLVMAddCFGSimplificationPass(pass);
-   LLVMRunPassManager(pass, lp_build_module);
-#else
-   (void)pass;
-#endif
+   for (l = 0; l < util_format_nr_test_cases; ++l) {
+      const struct util_format_test_case *test = &util_format_test_cases[l];
 
-   fetch_ptr = (fetch_ptr_t)pointer_to_func(LLVMGetPointerToGlobal(lp_build_engine, fetch));
+      if (test->format == desc->format) {
 
-   for (i = 0; i < desc->block.height; ++i) {
-      for (j = 0; j < desc->block.width; ++j) {
-
-         memset(unpacked, 0, sizeof unpacked);
-
-         fetch_ptr(unpacked, test->packed, j, i);
-
-         success = TRUE;
-         for(k = 0; k < 4; ++k)
-            if (fabs((float)test->unpacked[i][j][k] - unpacked[k]) > FLT_EPSILON)
-               success = FALSE;
-
-         if (!success) {
-            printf("FAILED\n");
-            printf("  Packed: %02x %02x %02x %02x\n",
-                   test->packed[0], test->packed[1], test->packed[2], test->packed[3]);
-            printf("  Unpacked (%u,%u): %f %f %f %f obtained\n",
-                   j, i,
-                   unpacked[0], unpacked[1], unpacked[2], unpacked[3]);
-            printf("                  %f %f %f %f expected\n",
-                   test->unpacked[i][j][0],
-                   test->unpacked[i][j][1],
-                   test->unpacked[i][j][2],
-                   test->unpacked[i][j][3]);
+         if (first) {
+            printf("Testing %s (float) ...\n",
+                   desc->name);
+            first = FALSE;
+         }
+
+         for (i = 0; i < desc->block.height; ++i) {
+            for (j = 0; j < desc->block.width; ++j) {
+               boolean match;
+
+               memset(unpacked, 0, sizeof unpacked);
+
+               fetch_ptr(unpacked, test->packed, j, i);
+
+               match = TRUE;
+               for(k = 0; k < 4; ++k)
+                  if (fabs((float)test->unpacked[i][j][k] - unpacked[k]) > FLT_EPSILON)
+                     match = FALSE;
+
+               if (!match) {
+                  printf("FAILED\n");
+                  printf("  Packed: %02x %02x %02x %02x\n",
+                         test->packed[0], test->packed[1], test->packed[2], test->packed[3]);
+                  printf("  Unpacked (%u,%u): %f %f %f %f obtained\n",
+                         j, i,
+                         unpacked[0], unpacked[1], unpacked[2], unpacked[3]);
+                  printf("                  %f %f %f %f expected\n",
+                         test->unpacked[i][j][0],
+                         test->unpacked[i][j][1],
+                         test->unpacked[i][j][2],
+                         test->unpacked[i][j][3]);
+                  success = FALSE;
+               }
+            }
          }
       }
    }
 
-   if (!success)
-      LLVMDumpValue(fetch);
+   if (!success) {
+      if (verbose < 1) {
+         LLVMDumpValue(fetch);
+      }
+   }
 
    LLVMFreeMachineCodeForFunction(lp_build_engine, fetch);
    LLVMDeleteFunction(fetch);
 
-   if(pass)
-      LLVMDisposePassManager(pass);
-
    if(fp)
       write_tsv_row(fp, desc, success);
 
@@ -196,32 +214,102 @@ test_format(unsigned verbose, FILE *fp,
 }
 
 
-
+PIPE_ALIGN_STACK
 static boolean
-test_one(unsigned verbose, FILE *fp,
-         const struct util_format_description *format_desc)
+test_format_unorm8(unsigned verbose, FILE *fp,
+                   const struct util_format_description *desc)
 {
-   unsigned i;
+   LLVMValueRef fetch = NULL;
+   fetch_ptr_t fetch_ptr;
+   uint8_t unpacked[4];
    boolean first = TRUE;
    boolean success = TRUE;
+   unsigned i, j, k, l;
 
-   for (i = 0; i < util_format_nr_test_cases; ++i) {
-      const struct util_format_test_case *test = &util_format_test_cases[i];
+   fetch = add_fetch_rgba_test(verbose, desc, lp_unorm8_vec4_type());
 
-      if (test->format == format_desc->format) {
+   fetch_ptr = (fetch_ptr_t)pointer_to_func(LLVMGetPointerToGlobal(lp_build_engine, fetch));
+
+   if (verbose >= 2) {
+      lp_disassemble(fetch_ptr);
+   }
+
+   for (l = 0; l < util_format_nr_test_cases; ++l) {
+      const struct util_format_test_case *test = &util_format_test_cases[l];
+
+      if (test->format == desc->format) {
 
          if (first) {
-            printf("Testing %s ...\n",
-                   format_desc->name);
+            printf("Testing %s (unorm8) ...\n",
+                   desc->name);
             first = FALSE;
          }
 
-         if (!test_format(verbose, fp, format_desc, test)) {
-           success = FALSE;
+         for (i = 0; i < desc->block.height; ++i) {
+            for (j = 0; j < desc->block.width; ++j) {
+               boolean match;
+
+               memset(unpacked, 0, sizeof unpacked);
+
+               fetch_ptr(unpacked, test->packed, j, i);
+
+               match = TRUE;
+               for(k = 0; k < 4; ++k) {
+                  int error = float_to_ubyte(test->unpacked[i][j][k]) - unpacked[k];
+                  if (error < 0)
+                     error = -error;
+                  if (error > 1)
+                     match = FALSE;
+               }
+
+               if (!match) {
+                  printf("FAILED\n");
+                  printf("  Packed: %02x %02x %02x %02x\n",
+                         test->packed[0], test->packed[1], test->packed[2], test->packed[3]);
+                  printf("  Unpacked (%u,%u): %02x %02x %02x %02x obtained\n",
+                         j, i,
+                         unpacked[0], unpacked[1], unpacked[2], unpacked[3]);
+                  printf("                  %02x %02x %02x %02x expected\n",
+                         float_to_ubyte(test->unpacked[i][j][0]),
+                         float_to_ubyte(test->unpacked[i][j][1]),
+                         float_to_ubyte(test->unpacked[i][j][2]),
+                         float_to_ubyte(test->unpacked[i][j][3]));
+                  success = FALSE;
+               }
+            }
          }
       }
    }
 
+   if (!success)
+      LLVMDumpValue(fetch);
+
+   LLVMFreeMachineCodeForFunction(lp_build_engine, fetch);
+   LLVMDeleteFunction(fetch);
+
+   if(fp)
+      write_tsv_row(fp, desc, success);
+
+   return success;
+}
+
+
+
+
+static boolean
+test_one(unsigned verbose, FILE *fp,
+         const struct util_format_description *format_desc)
+{
+   boolean success = TRUE;
+
+   if (!test_format_float(verbose, fp, format_desc)) {
+     success = FALSE;
+   }
+
+   if (!test_format_unorm8(verbose, fp, format_desc)) {
+     success = FALSE;
+   }
+
    return success;
 }