Move tables, test logic to core now compression is moved

Signed-off-by: Kimball Thurston <[email protected]>

BUILD.bazel

@@ -169,7 +169,6 @@ cc_library(
         "src/lib/IlmThread/IlmThreadConfig.h",
         "src/lib/OpenEXR/OpenEXRConfig.h",
         "src/lib/OpenEXR/OpenEXRConfigInternal.h",
-        "src/lib/OpenEXR/dwaLookups.h",
         "src/lib/OpenEXRCore/attributes.c",
         "src/lib/OpenEXRCore/backward_compatibility.h",
         "src/lib/OpenEXRCore/base.c",
@@ -199,6 +198,7 @@ cc_library(
         "src/lib/OpenEXRCore/internal_dwa_encoder.h",
         "src/lib/OpenEXRCore/internal_dwa_helpers.h",
         "src/lib/OpenEXRCore/internal_dwa_simd.h",
+        "src/lib/OpenEXRCore/dwaLookups.h",
         "src/lib/OpenEXRCore/internal_file.h",
         "src/lib/OpenEXRCore/internal_float_vector.h",
         "src/lib/OpenEXRCore/internal_huf.c",
@@ -375,8 +375,6 @@ cc_library(
         "src/lib/OpenEXR/ImfWav.cpp",
         "src/lib/OpenEXR/ImfZip.cpp",
         "src/lib/OpenEXR/ImfZipCompressor.cpp",
-        "src/lib/OpenEXR/b44ExpLogTable.h",
-        "src/lib/OpenEXR/dwaLookups.h",
     ],
     hdrs = [
         "src/lib/Iex/IexConfig.h",

src/lib/OpenEXR/CMakeLists.txt

@@ -29,8 +29,6 @@ openexr_define_library(OpenEXR
     ImfTiledMisc.h
     ImfZip.h
     ImfZipCompressor.h
-    b44ExpLogTable.h
-    dwaLookups.h
     ImfAcesFile.cpp
     ImfAttribute.cpp
     ImfB44Compressor.cpp

src/lib/OpenEXR/b44ExpLogTable.cpp

@@ -18,6 +18,9 @@
 //
 //	The tables are used by class B44Compressor.
 //
+// NB: the pre-computed table itself has moved to the core library,
+// and made internal to the C library
+//
 //---------------------------------------------------------------------------
 
 #include <half.h>

src/lib/OpenEXR/dwaLookups.cpp

@@ -7,6 +7,9 @@
 // A program to generate various acceleration lookup tables
 // for Imf::DwaCompressor
 //
+// NB: the pre-computed table itself has moved to the core library,
+// being C-only
+//
 
 #include <cstddef>
 #include <math.h>

src/lib/OpenEXRCore/internal_dwa_helpers.h

@@ -6,8 +6,7 @@
 #ifndef IMF_INTERNAL_DWA_HELPERS_H_HAS_BEEN_INCLUDED
 #define IMF_INTERNAL_DWA_HELPERS_H_HAS_BEEN_INCLUDED
 
-/* TODO: move to here when ready */
-#include "../OpenEXR/dwaLookups.h"
+#include "dwaLookups.h"
 
 /**************************************/
 

src/test/OpenEXRCoreTest/CMakeLists.txt

@@ -7,6 +7,7 @@ add_executable(OpenEXRCoreTest
   buffer.cpp
   buffer.h
   compression.cpp
+  compressionTables.cpp
   compression.h
   deep.cpp
   deep.h
@@ -104,6 +105,8 @@ define_openexrcore_tests(
  testWriteDeep
 
  testHUF
+ testDWATable
+ testB44Table
  testNoCompression
  testRLECompression
  testZIPCompression

src/test/OpenEXRCoreTest/compression.h

@@ -8,6 +8,9 @@
 
 void testHUF (const std::string& tempdir);
 
+void testDWATable (const std::string& tempdir);
+void testB44Table (const std::string& tempdir);
+
 void testNoCompression (const std::string& tempdir);
 void testRLECompression (const std::string& tempdir);
 void testZIPCompression (const std::string& tempdir);

src/test/OpenEXRTest/testDwaLookups.cpp → src/test/OpenEXRCoreTest/compressionTables.cpp

@@ -1,14 +1,20 @@
-//
 // SPDX-License-Identifier: BSD-3-Clause
-// Copyright (c) Contributors to the OpenEXR Project.
-//
+// Copyright Contributors to the OpenEXR Project.
 
-#include <assert.h>
-#include <cstddef>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <vector>
+// Windows specific addition to prevent the indirect import of the redefined min/max macros
+#if defined _WIN32 || defined _WIN64
+#    ifdef NOMINMAX
+#        undef NOMINMAX
+#    endif
+#    define NOMINMAX
+#endif
+
+#include "compression.h"
+
+#include "test_value.h"
+
+#include <openexr.h>
+#include <half.h>
 
 #include <OpenEXRConfig.h>
 #include <OpenEXRConfigInternal.h>
@@ -22,26 +28,31 @@
 #endif
 
 #include "ImfNamespace.h"
-#include "dwaLookups.h"
-#include <IlmThread.h>
-#include <IlmThreadSemaphore.h>
-#include <ImfIO.h>
-#include <ImfXdr.h>
-#include <half.h>
+#include "IlmThread.h"
+#include "IlmThreadSemaphore.h"
+#include "ImfIO.h"
+#include "ImfXdr.h"
 
-//
-// This test uses the code that generates the dwaLookups.h header to
-// validate that the values in the tables are correct.
-//
+#include <cstddef>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <vector>
 
-using namespace OPENEXR_IMF_NAMESPACE;
-using namespace OPENEXR_IMF_NAMESPACE;
+#if defined(OPENEXR_ENABLE_API_VISIBILITY)
+#include "../../lib/OpenEXRCore/internal_b44_table.c"
+#else
+extern const uint16_t* exrcore_expTable;
+extern const uint16_t* exrcore_logTable;
+#endif
 
-OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER
+namespace internal_test_ns {
 
-#include "dwaLookups.h"
+#include "../../lib/OpenEXRCore/dwaLookups.h"
 
-OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_EXIT
+} // namespace internal_test_ns
+
+using namespace OPENEXR_IMF_NAMESPACE;
 
 namespace
 {
@@ -221,14 +232,14 @@ class LutHeaderWorker
 //
 // Generate a no-op LUT, to cut down in conditional branches
 //
-void
+static void
 testNoop ()
 {
     printf ("test dwaCompressorNoOp[] \n");
 
     for (unsigned int i = 0; i < 65536; ++i)
     {
-        assert (i == OPENEXR_IMF_INTERNAL_NAMESPACE::dwaCompressorNoOp[i]);
+        EXRCORE_TEST (i == internal_test_ns::dwaCompressorNoOp[i]);
     }
 }
 
@@ -258,7 +269,7 @@ testNoop ()
 // outputs XDR half values.
 //
 
-void
+static void
 testToLinear ()
 {
     unsigned short toLinear[65536];
@@ -304,12 +315,12 @@ testToLinear ()
 
     printf ("test dwaCompressorToLinear[]\n");
     for (int i = 0; i < 65536; ++i)
-        assert (
+        EXRCORE_TEST (
             toLinear[i] ==
-            OPENEXR_IMF_INTERNAL_NAMESPACE::dwaCompressorToLinear[i]);
+            internal_test_ns::dwaCompressorToLinear[i]);
 }
 
-void
+static void
 testToNonlinear ()
 {
     unsigned short toNonlinear[65536];
@@ -358,16 +369,16 @@ testToNonlinear ()
 
     printf ("test dwaCompressorToNonlinear[]\n");
     for (int i = 0; i < 65536; ++i)
-        assert (
+        EXRCORE_TEST (
             toNonlinear[i] ==
-            OPENEXR_IMF_INTERNAL_NAMESPACE::dwaCompressorToNonlinear[i]);
+            internal_test_ns::dwaCompressorToNonlinear[i]);
 }
 
 //
 // Attempt to get available CPUs in a somewhat portable way.
 //
 
-int
+static int
 cpuCount ()
 {
     if (!ILMTHREAD_NAMESPACE::supportsThreads ()) return 1;
@@ -414,7 +425,7 @@ cpuCount ()
 // can exit fairly quickly.
 //
 
-void
+static void
 testLutHeader ()
 {
     std::vector<LutHeaderWorker*> workers;
@@ -464,8 +475,8 @@ testLutHeader ()
     {
         for (size_t value = 0; value < workers[i]->numValues (); ++value)
         {
-            assert (
-                OPENEXR_IMF_INTERNAL_NAMESPACE::closestDataOffset[offsetIdx] ==
+            EXRCORE_TEST (
+                internal_test_ns::closestDataOffset[offsetIdx] ==
                 workers[i]->offset ()[value] + offsetPrev);
             offsetIdx++;
         }
@@ -480,8 +491,8 @@ testLutHeader ()
         for (size_t element = 0; element < workers[i]->numElements ();
              ++element)
         {
-            assert (
-                OPENEXR_IMF_INTERNAL_NAMESPACE::closestData[elementIdx] ==
+            EXRCORE_TEST (
+                internal_test_ns::closestData[elementIdx] ==
                 workers[i]->elements ()[element]);
             elementIdx++;
         }
@@ -493,11 +504,49 @@ testLutHeader ()
     }
 }
 
+////////////////////////////////////////
+
 void
-testDwaLookups (const std::string&)
+testDWATable (const std::string&)
 {
     testNoop ();
     testToLinear ();
     testToNonlinear ();
     testLutHeader ();
 }
+
+////////////////////////////////////////
+
+void
+testB44Table (const std::string&)
+{
+    const int iMax = (1 << 16);
+
+    for (int i = 0; i < iMax; i++)
+    {
+        half h;
+        h.setBits (i);
+
+        if (!h.isFinite ())
+            h = 0;
+        else if (h >= 8 * log (HALF_MAX))
+            h = HALF_MAX;
+        else
+            h = exp (h / 8);
+
+        EXRCORE_TEST (exrcore_expTable[i] == h.bits ());
+    }
+
+    for (int i = 0; i < iMax; i++)
+    {
+        half h;
+        h.setBits (i);
+
+        if (!h.isFinite () || h < 0)
+            h = 0;
+        else
+            h = 8 * log (h);
+
+        EXRCORE_TEST (exrcore_logTable[i] == h.bits ());
+    }
+}

src/test/OpenEXRCoreTest/main.cpp

@@ -193,6 +193,8 @@ main (int argc, char* argv[])
     TEST (testWriteDeep, "core_write");
 
     TEST (testHUF, "core_compression");
+    TEST (testDWATable, "core_compression");
+    TEST (testB44Table, "core_compression");
     TEST (testNoCompression, "core_compression");
     TEST (testRLECompression, "core_compression");
     TEST (testZIPCompression, "core_compression");

src/test/OpenEXRTest/CMakeLists.txt

@@ -15,8 +15,6 @@ add_executable(OpenEXRTest
   random.h
   testAttributes.cpp
   testAttributes.h
-  testB44ExpLogTable.cpp
-  testB44ExpLogTable.h
   testBackwardCompatibility.cpp
   testBackwardCompatibility.h
   testBadTypeAttributes.cpp
@@ -51,8 +49,6 @@ add_executable(OpenEXRTest
   testDeepScanLineMultipleRead.h
   testDeepTiledBasic.cpp
   testDeepTiledBasic.h
-  testDwaLookups.cpp
-  testDwaLookups.h
   testExistingStreams.cpp
   testExistingStreams.h
   testFutureProofing.cpp
@@ -151,7 +147,6 @@ endfunction()
 
 define_openexr_tests(
  testAttributes
- testB44ExpLogTable
  testBackwardCompatibility
  testBadTypeAttributes
  testChannels

src/test/OpenEXRTest/main.cpp

@@ -11,7 +11,6 @@
 #include "OpenEXRConfigInternal.h"
 
 #include "testAttributes.h"
-#include "testB44ExpLogTable.h"
 #include "testBackwardCompatibility.h"
 #include "testBadTypeAttributes.h"
 #include "testChannels.h"
@@ -29,7 +28,6 @@
 #include "testDeepScanLineHuge.h"
 #include "testDeepScanLineMultipleRead.h"
 #include "testDeepTiledBasic.h"
-#include "testDwaLookups.h"
 #include "testExistingStreams.h"
 #include "testFutureProofing.h"
 #include "testHeader.h"
@@ -229,8 +227,6 @@ main (int argc, char* argv[])
     TEST (testBackwardCompatibility, "core");
     TEST (testFutureProofing, "core");
     TEST (testRle, "core");
-    TEST (testB44ExpLogTable, "core");
-    TEST (testDwaLookups, "core");
     TEST (testIDManifest, "core");
     TEST (testCpuId, "core");
     TEST (testHeader, "basic");