[gegl] perf: update tests to not use deprecated apis



commit 6454cf100a48d26c7d14c67e1690fd7e7a22f3f3
Author: Øyvind Kolås <pippin gimp org>
Date:   Sat Jun 14 02:49:53 2014 +0200

    perf: update tests to not use deprecated apis

 perf/Makefile.am                |    6 ++++--
 perf/test-bcontrast-4x.c        |   35 +++++++++++++++++++++++++++++++++++
 perf/test-bcontrast-minichunk.c |   17 +++++++++--------
 perf/test-bcontrast.c           |   12 +++++++-----
 perf/test-blur.c                |   28 ++++++++++++++++++----------
 perf/test-passthrough.c         |   31 -------------------------------
 perf/test-rotate.c              |   34 +++++++++++++++++-----------------
 perf/test-unsharpmask.c         |   30 +++++++++++++++++++-----------
 8 files changed, 109 insertions(+), 84 deletions(-)
---
diff --git a/perf/Makefile.am b/perf/Makefile.am
index 7adc59f..d9d25f0 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -3,8 +3,9 @@ noinst_PROGRAMS = \
        test-blur \
        test-bcontrast \
        test-bcontrast-minichunk \
+       test-bcontrast-megachunk \
        test-unsharpmask \
-       test-passthrough \
+       test-bcontrast-4x \
        test-gegl-buffer-access \
        test-rotate
 
@@ -38,7 +39,8 @@ test_rotate_SOURCES = test-rotate.c
 test_blur_SOURCES = test-blur.c
 test_bcontrast_SOURCES = test-bcontrast.c
 test_bcontrast_minichunk_SOURCES = test-bcontrast-minichunk.c
-test_passthrough_SOURCES = test-passthrough.c
+test_bcontrast_megachunk_SOURCES = test-bcontrast-megachunk.c
+test_bcontrast_4x_SOURCES = test-bcontrast-4x.c
 test_unsharpmask_SOURCES = test-unsharpmask.c
 test_gegl_buffer_access_SOURCES = test-gegl-buffer-access.c
 
diff --git a/perf/test-bcontrast-4x.c b/perf/test-bcontrast-4x.c
new file mode 100644
index 0000000..3aaa21c
--- /dev/null
+++ b/perf/test-bcontrast-4x.c
@@ -0,0 +1,35 @@
+#include "test-common.h"
+
+gint
+main (gint    argc,
+      gchar **argv)
+{
+  GeglBuffer *buffer, *buffer2;
+  GeglNode   *gegl, *source, *node1, *node2, *node3, *node4, *sink;
+  gint i;
+
+  gegl_init (&argc, &argv);
+
+  buffer = test_buffer (2048, 1024, babl_format ("RGBA float"));
+
+#define ITERATIONS 8
+  test_start ();
+  for (i=0;i< ITERATIONS;i++)
+    {
+      gegl = gegl_node_new ();
+      source = gegl_node_new_child (gegl, "operation", "gegl:buffer-source", "buffer", buffer, NULL);
+      node1 = gegl_node_new_child (gegl, "operation", "gegl:brightness-contrast", "contrast", 0.2, NULL);
+      node2 = gegl_node_new_child (gegl, "operation", "gegl:brightness-contrast", "contrast", 0.2, NULL);
+      node3 = gegl_node_new_child (gegl, "operation", "gegl:brightness-contrast", "contrast", 0.2, NULL);
+      node4 = gegl_node_new_child (gegl, "operation", "gegl:brightness-contrast", "contrast", 0.2, NULL);
+      sink = gegl_node_new_child (gegl, "operation", "gegl:buffer-sink", "buffer", &buffer2, NULL);
+
+      gegl_node_link_many (source, node1, node2, node3, node4, sink, NULL);
+      gegl_node_process (sink);
+      g_object_unref (gegl);
+      g_object_unref (buffer2);
+    }
+  test_end ("bcontrast_4x", gegl_buffer_get_pixel_count (buffer) * 16 * ITERATIONS);
+
+  return 0;
+}
diff --git a/perf/test-bcontrast-minichunk.c b/perf/test-bcontrast-minichunk.c
index d8b925d..8543307 100644
--- a/perf/test-bcontrast-minichunk.c
+++ b/perf/test-bcontrast-minichunk.c
@@ -5,29 +5,30 @@ main (gint    argc,
       gchar **argv)
 {
   GeglBuffer *buffer, *buffer2;
-  GeglNode   *gegl, *sink;
+  GeglNode   *gegl, *source, *node, *sink;
   gint i;
 
   gegl_init (&argc, &argv);
 
-  g_object_set (gegl_config (), "chunk-size", 128 * 128, NULL);
+  g_object_set (gegl_config (), "chunk-size", 32 * 32, NULL);
 
-  buffer = test_buffer (1024, 1024, babl_format ("RGBA float"));
+  buffer = test_buffer (2048, 1024, babl_format ("RGBA float"));
 
-#define ITERATIONS 6
+#define ITERATIONS 8
   test_start ();
   for (i=0;i< ITERATIONS;i++)
     {
-      gegl = gegl_graph (sink = gegl_node ("gegl:buffer-sink", "buffer", &buffer2, NULL,
-                                gegl_node ("gegl:brightness-contrast", "contrast", 0.2, NULL,
-                                gegl_node ("gegl:buffer-source", "buffer", buffer, NULL))));
+      gegl = gegl_node_new ();
+      source = gegl_node_new_child (gegl, "operation", "gegl:buffer-source", "buffer", buffer, NULL);
+      node = gegl_node_new_child (gegl, "operation", "gegl:brightness-contrast", "contrast", 0.2, NULL);
+      sink = gegl_node_new_child (gegl, "operation", "gegl:buffer-sink", "buffer", &buffer2, NULL);
 
+      gegl_node_link_many (source, node, sink, NULL);
       gegl_node_process (sink);
       g_object_unref (gegl);
       g_object_unref (buffer2);
     }
   test_end ("bcontrast-minichunk", gegl_buffer_get_pixel_count (buffer) * 16 * ITERATIONS);
 
-
   return 0;
 }
diff --git a/perf/test-bcontrast.c b/perf/test-bcontrast.c
index 295267d..7e4a1a8 100644
--- a/perf/test-bcontrast.c
+++ b/perf/test-bcontrast.c
@@ -5,21 +5,23 @@ main (gint    argc,
       gchar **argv)
 {
   GeglBuffer *buffer, *buffer2;
-  GeglNode   *gegl, *sink;
+  GeglNode   *gegl, *source, *node, *sink;
   gint i;
 
   gegl_init (&argc, &argv);
 
-  buffer = test_buffer (1024, 1024, babl_format ("RGBA float"));
+  buffer = test_buffer (2048, 1024, babl_format ("RGBA float"));
 
 #define ITERATIONS 8
   test_start ();
   for (i=0;i< ITERATIONS;i++)
     {
-      gegl = gegl_graph (sink = gegl_node ("gegl:buffer-sink", "buffer", &buffer2, NULL,
-                                gegl_node ("gegl:brightness-contrast", "contrast", 0.2, NULL,
-                                gegl_node ("gegl:buffer-source", "buffer", buffer, NULL))));
+      gegl = gegl_node_new ();
+      source = gegl_node_new_child (gegl, "operation", "gegl:buffer-source", "buffer", buffer, NULL);
+      node = gegl_node_new_child (gegl, "operation", "gegl:brightness-contrast", "contrast", 0.2, NULL);
+      sink = gegl_node_new_child (gegl, "operation", "gegl:buffer-sink", "buffer", &buffer2, NULL);
 
+      gegl_node_link_many (source, node, sink, NULL);
       gegl_node_process (sink);
       g_object_unref (gegl);
       g_object_unref (buffer2);
diff --git a/perf/test-blur.c b/perf/test-blur.c
index 80144ca..0f233af 100644
--- a/perf/test-blur.c
+++ b/perf/test-blur.c
@@ -5,23 +5,31 @@ main (gint    argc,
       gchar **argv)
 {
   GeglBuffer *buffer, *buffer2;
-  GeglNode   *gegl, *sink;
+  GeglNode   *gegl, *source, *node, *sink;
+  gint i;
 
   gegl_init (&argc, &argv);
 
-  buffer = test_buffer (1024, 1024, babl_format ("RGBA float"));
+  buffer = test_buffer (2048, 1024, babl_format ("RGBA float"));
 
-  gegl = gegl_graph (sink = gegl_node ("gegl:buffer-sink", "buffer", &buffer2, NULL,
-                            gegl_node ("gegl:gaussian-blur",
+#define ITERATIONS 8
+  test_start ();
+  for (i=0;i< ITERATIONS;i++)
+    {
+      gegl = gegl_node_new ();
+      source = gegl_node_new_child (gegl, "operation", "gegl:buffer-source", "buffer", buffer, NULL);
+      node = gegl_node_new_child (gegl, "operation", "gegl:gaussian-blur",
                                        "std-dev-x", 0.5,
                                        "std-dev-y", 0.5,
-                                       NULL,
-                            gegl_node ("gegl:buffer-source", "buffer", buffer, NULL))));
+                                       NULL);
+      sink = gegl_node_new_child (gegl, "operation", "gegl:buffer-sink", "buffer", &buffer2, NULL);
 
-  test_start ();
-  gegl_node_process (sink);
-  test_end ("gaussian-blur", gegl_buffer_get_pixel_count (buffer) * 16);
-  g_object_unref (gegl);
+      gegl_node_link_many (source, node, sink, NULL);
+      gegl_node_process (sink);
+      g_object_unref (gegl);
+      g_object_unref (buffer2);
+    }
+  test_end ("gaussian-blur", gegl_buffer_get_pixel_count (buffer) * 16 * ITERATIONS);
 
   return 0;
 }
diff --git a/perf/test-rotate.c b/perf/test-rotate.c
index 7c044ea..c5ebb7a 100644
--- a/perf/test-rotate.c
+++ b/perf/test-rotate.c
@@ -5,15 +5,18 @@ main (gint    argc,
       gchar **argv)
 {
   GeglBuffer *buffer, *buffer2;
-  GeglNode   *gegl, *sink;
+  GeglNode   *gegl, *source, *rotate, *sink;
 
   gegl_init (&argc, &argv);
 
-  buffer = test_buffer (1024, 1024, babl_format ("RGBA float"));
+  buffer = test_buffer (2048, 1024, babl_format ("RGBA float"));
 
-  gegl = gegl_graph (sink = gegl_node ("gegl:buffer-sink", "buffer", &buffer2, NULL,
-                            gegl_node ("gegl:rotate", "degrees", 4.0, NULL,
-                            gegl_node ("gegl:buffer-source", "buffer", buffer, NULL))));
+  gegl = gegl_node_new ();
+  source = gegl_node_new_child (gegl, "operation", "gegl:buffer-source", "buffer", buffer, NULL);
+  rotate = gegl_node_new_child (gegl, "operation", "gegl:rotate", "degrees", 4.0, NULL);
+  sink = gegl_node_new_child (gegl, "operation", "gegl:buffer-sink", "buffer", &buffer2, NULL);
+
+  gegl_node_link_many (source, rotate, sink, NULL);
 
   test_start ();
   gegl_node_process (sink);
@@ -21,22 +24,19 @@ main (gint    argc,
 
   g_object_unref (gegl);
 
-  {
-    GeglBuffer *buffer, *buffer2;
-    GeglNode   *gegl, *sink;
 
-    gegl_init (&argc, &argv);
+  gegl = gegl_node_new ();
+  source = gegl_node_new_child (gegl, "operation", "gegl:buffer-source", "buffer", buffer, NULL);
+  rotate = gegl_node_new_child (gegl, "operation", "gegl:rotate", "degrees", 4.0, GEGL_SAMPLER_NEAREST, 
NULL);
+  sink = gegl_node_new_child (gegl, "operation", "gegl:buffer-sink", "buffer", &buffer2, NULL);
 
-    buffer = test_buffer (1024, 1024, babl_format ("RGBA float"));
+  gegl_node_link_many (source, rotate, sink, NULL);
 
-    gegl = gegl_graph (sink = gegl_node ("gegl:buffer-sink", "buffer", &buffer2, NULL,
-                              gegl_node ("gegl:rotate", "degrees", 4.0, "sampler", GEGL_SAMPLER_NEAREST, 
NULL,
-                              gegl_node ("gegl:buffer-source", "buffer", buffer, NULL))));
+  test_start ();
+  gegl_node_process (sink);
+  test_end ("rotate-nearest",  gegl_buffer_get_pixel_count (buffer) * 16);
 
-    test_start ();
-    gegl_node_process (sink);
-    test_end ("rotate-nearest",  gegl_buffer_get_pixel_count (buffer) * 16);
-  }
+  g_object_unref (gegl);
 
   return 0;
 }
diff --git a/perf/test-unsharpmask.c b/perf/test-unsharpmask.c
index defe854..38835a8 100644
--- a/perf/test-unsharpmask.c
+++ b/perf/test-unsharpmask.c
@@ -5,23 +5,31 @@ main (gint    argc,
       gchar **argv)
 {
   GeglBuffer *buffer, *buffer2;
-  GeglNode   *gegl, *sink;
+  GeglNode   *gegl, *source, *node, *sink;
+  gint i;
 
   gegl_init (&argc, &argv);
 
-  buffer = test_buffer (1024, 1024, babl_format ("RGBA float"));
+  buffer = test_buffer (2048, 1024, babl_format ("RGBA float"));
 
-  gegl = gegl_graph (sink = gegl_node ("gegl:buffer-sink", "buffer", &buffer2, NULL,
-                            gegl_node ("gegl:unsharp-mask",
-                                       "std-dev", 2.1,
+#define ITERATIONS 8
+  test_start ();
+  for (i=0;i< ITERATIONS;i++)
+    {
+      gegl = gegl_node_new ();
+      source = gegl_node_new_child (gegl, "operation", "gegl:buffer-source", "buffer", buffer, NULL);
+      node = gegl_node_new_child (gegl, "operation", "gegl:unsharp-mask",
+                                       "std-dev", 3.1,
                                        "scale", 1.2,
-                                       NULL,
-                            gegl_node ("gegl:buffer-source", "buffer", buffer, NULL))));
+                                       NULL);
+      sink = gegl_node_new_child (gegl, "operation", "gegl:buffer-sink", "buffer", &buffer2, NULL);
 
-  test_start ();
-  gegl_node_process (sink);
-  test_end ("unsharp-mask", gegl_buffer_get_pixel_count (buffer) * 16);
-  g_object_unref (gegl);
+      gegl_node_link_many (source, node, sink, NULL);
+      gegl_node_process (sink);
+      g_object_unref (gegl);
+      g_object_unref (buffer2);
+    }
+  test_end ("unsharp-mask", gegl_buffer_get_pixel_count (buffer) * 16 * ITERATIONS);
 
   return 0;
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]