From 3130b9921cac4a8674b59c6d63bc2d248a4bdc4a Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Sat, 8 Aug 2009 23:15:05 +0100
Subject: llvmpipe: Update blending test.

---
 src/gallium/drivers/llvmpipe/lp_test_blend.c | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_test_blend.c b/src/gallium/drivers/llvmpipe/lp_test_blend.c
index 8dc16e3511..c8901fea98 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_blend.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_blend.c
@@ -123,6 +123,7 @@ dump_blend_type(FILE *fp,
            type.norm ? "n" : "",
            type.length);
 
+   fprintf(fp, " ...\n");
    fflush(fp);
 }
 
@@ -444,8 +445,8 @@ test_one(unsigned verbose,
 
    provider = LLVMCreateModuleProviderForExistingModule(module);
    if (LLVMCreateJITCompiler(&engine, provider, 1, &error)) {
-      dump_blend_type(stderr, blend, type);
-      fprintf(stderr, "\n");
+      if(verbose < 1)
+         dump_blend_type(stderr, blend, type);
       fprintf(stderr, "%s\n", error);
       LLVMDisposeMessage(error);
       abort();
@@ -510,8 +511,8 @@ test_one(unsigned verbose,
       success = compare_vec(type, res, ref);
 
       if (!success) {
-         dump_blend_type(stderr, blend, type);
-         fprintf(stderr, "\n");
+         if(verbose < 1)
+            dump_blend_type(stderr, blend, type);
          fprintf(stderr, "MISMATCH\n");
 
          fprintf(stderr, "  Src: ");
@@ -567,23 +568,15 @@ test_one(unsigned verbose,
 
    }
 
-   if(verbose >= 1) {
-      fprintf(stdout, " cycles=%.1f", cycles_avg);
-      fprintf(stdout, " cycles_per_elem=%.1f", cycles_avg/type.length);
-   }
-
-   if(verbose >= 1) {
-      fprintf(stdout, " result=%s\n", success ? "pass" : "fail");
-      fflush(stdout);
-   }
-
    if(fp)
       write_tsv_row(fp, blend, type, cycles_avg, success);
 
    if (!success) {
-      LLVMDumpModule(module);
+      if(verbose < 2)
+         LLVMDumpModule(module);
       LLVMWriteBitcodeToFile(module, "blend.bc");
       fprintf(stderr, "blend.bc written\n");
+      fprintf(stderr, "Invoke as \"llc -o - blend.bc\"\n");
       abort();
    }
 
-- 
cgit v1.2.3