Mesa (master): llvmpipe: Share testing infrastructure with lp_test_format.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sun Oct 25 09:55:37 UTC 2009
Module: Mesa
Branch: master
Commit: fedd054d534206a5ebd6fed204aa97cbb5053b3a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fedd054d534206a5ebd6fed204aa97cbb5053b3a
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Oct 22 21:16:26 2009 +0100
llvmpipe: Share testing infrastructure with lp_test_format.
---
src/gallium/drivers/llvmpipe/SConscript | 2 +-
src/gallium/drivers/llvmpipe/lp_test_format.c | 67 +++++++++++++++++--------
2 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index 72e445b..169e0ab 100644
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -77,7 +77,7 @@ env.Prepend(LIBS = [llvmpipe] + auxiliaries)
env.Program(
target = 'lp_test_format',
- source = ['lp_test_format.c'],
+ source = ['lp_test_format.c', 'lp_test_main.c'],
)
env.Program(
diff --git a/src/gallium/drivers/llvmpipe/lp_test_format.c b/src/gallium/drivers/llvmpipe/lp_test_format.c
index 0fe4742..b2403ad 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_format.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_format.c
@@ -39,6 +39,7 @@
#include "util/u_format.h"
#include "lp_bld_format.h"
+#include "lp_test.h"
struct pixel_test_case
@@ -89,14 +90,37 @@ struct pixel_test_case test_cases[] =
};
+void
+write_tsv_header(FILE *fp)
+{
+ fprintf(fp,
+ "result\t"
+ "format\n");
+
+ fflush(fp);
+}
+
+
+static void
+write_tsv_row(FILE *fp,
+ const struct util_format_description *desc,
+ boolean success)
+{
+ fprintf(fp, "%s\t", success ? "pass" : "fail");
+
+ fprintf(fp, "%s\n", desc->name);
+
+ fflush(fp);
+}
+
+
typedef void (*load_ptr_t)(const uint32_t packed, float *);
static LLVMValueRef
add_load_rgba_test(LLVMModuleRef module,
- enum pipe_format format)
+ const struct util_format_description *desc)
{
- const struct util_format_description *desc;
LLVMTypeRef args[2];
LLVMValueRef func;
LLVMValueRef packed;
@@ -105,8 +129,6 @@ add_load_rgba_test(LLVMModuleRef module,
LLVMBuilderRef builder;
LLVMValueRef rgba;
- desc = util_format_description(format);
-
args[0] = LLVMInt32Type();
args[1] = LLVMPointerType(LLVMVectorType(LLVMFloatType(), 4), 0);
@@ -138,9 +160,8 @@ typedef void (*store_ptr_t)(uint32_t *, const float *);
static LLVMValueRef
add_store_rgba_test(LLVMModuleRef module,
- enum pipe_format format)
+ const struct util_format_description *desc)
{
- const struct util_format_description *desc;
LLVMTypeRef args[2];
LLVMValueRef func;
LLVMValueRef packed_ptr;
@@ -150,8 +171,6 @@ add_store_rgba_test(LLVMModuleRef module,
LLVMValueRef rgba;
LLVMValueRef packed;
- desc = util_format_description(format);
-
args[0] = LLVMPointerType(LLVMInt32Type(), 0);
args[1] = LLVMPointerType(LLVMVectorType(LLVMFloatType(), 4), 0);
@@ -181,7 +200,7 @@ add_store_rgba_test(LLVMModuleRef module,
static boolean
-test_format(const struct pixel_test_case *test)
+test_format(unsigned verbose, FILE *fp, const struct pixel_test_case *test)
{
LLVMModuleRef module = NULL;
LLVMValueRef load = NULL;
@@ -203,8 +222,8 @@ test_format(const struct pixel_test_case *test)
module = LLVMModuleCreateWithName("test");
- load = add_load_rgba_test(module, test->format);
- store = add_store_rgba_test(module, test->format);
+ load = add_load_rgba_test(module, desc);
+ store = add_store_rgba_test(module, desc);
if(LLVMVerifyModule(module, LLVMPrintMessageAction, &error)) {
LLVMDumpModule(module);
@@ -266,25 +285,29 @@ test_format(const struct pixel_test_case *test)
if(pass)
LLVMDisposePassManager(pass);
+ if(fp)
+ write_tsv_row(fp, desc, success);
+
return success;
}
-int main(int argc, char **argv)
+boolean
+test_all(unsigned verbose, FILE *fp)
{
unsigned i;
- int ret;
+ bool success = TRUE;
-#ifdef LLVM_NATIVE_ARCH
- LLVMLinkInJIT();
- LLVMInitializeNativeTarget();
-#endif
+ for (i = 0; i < sizeof(test_cases)/sizeof(test_cases[0]); ++i)
+ if(!test_format(verbose, fp, &test_cases[i]))
+ success = FALSE;
- util_cpu_detect();
+ return success;
+}
- for (i = 0; i < sizeof(test_cases)/sizeof(test_cases[0]); ++i)
- if(!test_format(&test_cases[i]))
- ret = 1;
- return ret;
+boolean
+test_some(unsigned verbose, FILE *fp, unsigned long n)
+{
+ return test_all(verbose, fp);
}
More information about the mesa-commit
mailing list