Update change log as well as some comments and build instructions.

c-lipka · c-lipka · commit 5ed6025ecb39 · 2017-02-19T04:54:21.000+01:00
diff --git a/changes.txt b/changes.txt
@@ -24,10 +24,11 @@ should be located in the same directory as this file is.
 ------------------------------------------------------------------------------
 
 
-Changes between 3.7.1-beta.2 and 3.7.1-TBD
-==========================================
+Changes between 3.7.1-beta.2 and 3.7.1-beta.3
+=============================================
 
-The focus of this version has been on fixing bugs.
+The focus of this version has been on fixing bugs, as well as adding
+hardware-specific performance optiomizations.
 
 Fixed or Mitigated Bugs
 -----------------------
@@ -63,9 +64,9 @@ Miscellaneous:
 Other Noteworthy
 ----------------
 
-New Sample Scenes:
-
-  - A new sample scene has been added to demonstrate the `aoi` pattern.
+  - Added a new sample scene to demonstrate the `aoi` pattern.
+  - Added Intel optimizations for noise (courtesy of Intel; requires
+    AVX2/FMA3-capable CPU).
 
 
 Changes between 3.7.1-beta.1 and 3.7.1-beta.2
diff --git a/platform/x86/avx2fma3noise.cpp b/platform/x86/avx2fma3noise.cpp
@@ -16,7 +16,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2015 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -311,7 +311,7 @@ DBL AVX2FMA3Noise(const Vector3d& EPoint, int noise_generator)
         {
             throw POV_EXCEPTION_STRING("Noise error");
         }
-        
+
     }
 
 #endif
@@ -494,7 +494,7 @@ void AVX2FMA3DNoise(Vector3d& result, const Vector3d& EPoint)
         {
             throw POV_EXCEPTION_STRING("DNoise Z error");
         }
-                
+
     }
 
 #endif
diff --git a/platform/x86/avx2fma3noise.h b/platform/x86/avx2fma3noise.h
@@ -9,7 +9,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2015 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
diff --git a/platform/x86/avxfma4noise.cpp b/platform/x86/avxfma4noise.cpp
@@ -11,7 +11,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2015 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -327,8 +327,6 @@ DBL AVXFMA4Noise(const Vector3d& EPoint, int noise_generator)
 *
 ******************************************************************************/
 
-/// Optimized DNoise function using AVX and FMA4 instructions.
-/// @author Optimized by AMD
 void AVXFMA4DNoise(Vector3d& result, const Vector3d& EPoint)
 {
     DBL x, y, z;
diff --git a/platform/x86/avxfma4noise.h b/platform/x86/avxfma4noise.h
@@ -9,7 +9,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2015 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -47,7 +47,6 @@ namespace pov
 
 bool AVXFMA4NoiseSupported();
 
-/// FMA4 version of the Noise function.
 /// Optimized Noise function using AVX and FMA4 instructions.
 /// @author Optimized by AMD
 DBL AVXFMA4Noise(const Vector3d& EPoint, int noise_generator);
diff --git a/platform/x86/avxnoise.cpp b/platform/x86/avxnoise.cpp
@@ -16,7 +16,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2015 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -324,7 +324,7 @@ DBL AVXNoise(const Vector3d& EPoint, int noise_generator)
         {
             throw POV_EXCEPTION_STRING("Noise error");
         }
-        
+
     }
 
 #endif
@@ -507,7 +507,7 @@ void AVXDNoise(Vector3d& result, const Vector3d& EPoint)
         {
             throw POV_EXCEPTION_STRING("DNoise Z error");
         }
-                
+
     }
 
 #endif
diff --git a/platform/x86/avxnoise.h b/platform/x86/avxnoise.h
@@ -9,7 +9,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2015 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
diff --git a/platform/x86/cpuid.cpp b/platform/x86/cpuid.cpp
@@ -8,7 +8,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2015 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -214,4 +214,3 @@ bool HaveAVX2FMA3()
     // Aggregate the information
     return osxsave && avx && fma3 && avx2 && OSSavesAVXRegisters();
 }
-
diff --git a/platform/x86/cpuid.h b/platform/x86/cpuid.h
@@ -9,7 +9,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2015 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
diff --git a/platform/x86/optimizednoise.h b/platform/x86/optimizednoise.h
@@ -9,7 +9,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2015 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
diff --git a/revision.txt b/revision.txt
@@ -27,9 +27,20 @@ Notes:
 ------------------------------------------------------------------------------
 
 ------------------------------------------------------------------------------
-POV-Ray v3.7.1-TBD
+POV-Ray v3.7.1-beta.3
 ------------------------------------------------------------------------------
 
+Commit 7f41d96 on 2017-02-19 by Christoph Lipka
+
+    Add optimized noise implementation from Intel for AVX2/FMA3-capable CPUs.
+
+    Also overhauled optimized noise for AVX/FMA4-capable CPUs, as well as
+    CPU type identification code.
+
+Commit 9cf8a79 on 2017-02-16 by Christoph Lipka
+
+    Fix handling of special directory name `.` in POV-Ray for Windows.
+
 Commit b4605a5 on 2017-02-14 by William F. Pokorny (wfpokorny)
 
     Fixing thread stack size overrun crash. (#235)
diff --git a/unix/configure.ac b/unix/configure.ac
@@ -83,7 +83,7 @@ required_libsdl_version="1.2"
 required_openexr_version="1.2"
 
 # Supported options.
-AX_ARG_ENABLE([--enable-avx2],             [enable AVX2 features and compiler optmization])
+# AX_ARG_ENABLE([--enable-avx2],             [enable AVX2 features and compiler optmization])
 AX_ARG_ENABLE([--enable-watch-cursor],     [enable a watch cursor over the display while rendering (X Window only)])
 AX_ARG_ENABLE([--enable-debug],            [enable compiler debugging mode])
 AX_ARG_ENABLE([--enable-profile],          [enable program execution profiling])
@@ -509,15 +509,15 @@ else
     fi
   fi
 
-  AM_CONDITIONAL([BUILD_AVX2], [test x$enable_avx2 = xyes])
-  if test x"$enable_avx2" = x"yes"; then
-    AC_MSG_RESULT([yes])
-    AC_DEFINE([ENABLE_AVX2], [],[Enable AVX2 features and compiler optimization])
-
-    CXXFLAGS="$CXXFLAGS -mavx2 -mfma"  # append
-  else
-    AC_MSG_RESULT([no])
-  fi
+#  AM_CONDITIONAL([BUILD_AVX2], [test x$enable_avx2 = xyes])
+#  if test x"$enable_avx2" = x"yes"; then
+#    AC_MSG_RESULT([yes])
+#    AC_DEFINE([ENABLE_AVX2], [],[Enable AVX2 features and compiler optimization])
+#
+#    CXXFLAGS="$CXXFLAGS -mavx2 -mfma"  # append
+#  else
+#    AC_MSG_RESULT([no])
+#  fi
 
   ### Note from Warp <warp@tag.povray.org> :
   # Using "-static" for static linking in Solaris causes a linkage error.
diff --git a/unix/povconfig/syspovconfig_gnu.h b/unix/povconfig/syspovconfig_gnu.h
@@ -11,7 +11,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
diff --git a/unix/prebuild.sh b/unix/prebuild.sh
@@ -1384,9 +1384,9 @@ noinst_LIBRARIES = libplatform.a
 libplatform_a_SOURCES = \\
 `echo $files`
 
-if BUILD_AVX2
-libplatform_a_SOURCES += x86/avx2fma3noise.cpp x86/avx2fma3noise.h x86/cpuid.cpp x86/cpuid.h
-endif
+# if BUILD_AVX2
+# libplatform_a_SOURCES += x86/avx2fma3noise.cpp x86/avx2fma3noise.h x86/cpuid.cpp x86/cpuid.h
+# endif
 
 # Include paths for headers.
 AM_CPPFLAGS = \\
diff --git a/windows/povconfig/syspovconfig_msvc.h b/windows/povconfig/syspovconfig_msvc.h
@@ -11,7 +11,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
diff --git a/windows/readme.html b/windows/readme.html
@@ -76,33 +76,37 @@ <h3>Assistance</h3>
 
 <h2>Compilers</h2>
 
-<h3>Visual Studio 2010 and 2012</h3>
+<h3>Visual Studio 2015</h3>
 
 <p>
-Currently the only officially supported means of building the Windows version
-of POV-Ray is via the provided Visual Studio 2010 project (you can also use it
-with VS 2012) with a full version of Visual Studio and the compilers provided
-with it or with the platform SDK.
+For optimum performance, we generally recommend using Visual Studio 2015
+(Community Edition will suffice).
 </p>
 <p>
-The Visual Studio 2010 project is located in the "windows/vs10" subdirectory.
+We currently do not provide dedicated Visual Studio 2015 project files.
+Instead, simply load and auto-convert the Visual Studio 2010 projects
+located in the "windows/vs10" subdirectory.
+</p>
+<p>
+<b>Note:</b> By default, binaries generated by Visual Studio 2015 will be
+incompatible with Windows XP. If you need XP support, you will have to change
+the platform toolset from <code>v140</code> to <code>v140_xp</code>, either by manually editing all
+project settings or by running the build from the command prompt with the
+environment variable <code>PlatformToolset</code> set to <code>v140_xp</code>. However, it has been
+reported that binaries built in this manner exhibit unexpected behaviour, and
+to generate XP-compatible binaries we recommend using VS 2010 instead.
 </p>
 
-<h3>Visual Studio 2015</h3>
+<h3>Visual Studio 2010 and 2012</h3>
 
 <p>
-The Visual Studio 2010 projects should also build fine in Visual Studio 2015
-after automatic conversion, as has been tested with the Visual Studio 2015
-Community edition.
+To build POV-Ray binaries with Visual Studio 2010, you will need a full
+version of Visual Studio and the compilers provided with it or with the
+platform SDK. Visual Studio 2012 has not been tested in a while, but should
+still work as well.
 </p>
-
 <p>
-<b>Note:</b> By default, binaries generated by Visual Studio 2015 will be
-incompatible with Windows XP. If you need XP support, you will have to change
-the platform toolset from <code>v140</code> to <code>v140_xp</code>, either by
-manually editing all project settings or by running the build from the command
-prompt with the environment variable <code>PlatformToolset</code> set to
-<code>v140_xp</code>.
+The Visual Studio 2010 project is located in the "windows/vs10" subdirectory.
 </p>
 
 <h3>Earlier Versions of Visual Studio</h3>
diff --git a/windows/readme.txt b/windows/readme.txt
@@ -46,29 +46,33 @@ These groups provide the best means for support with relation to this subject.
 Compilers
 =========
 
-Visual Studio 2010 and 2012
----------------------------
-
-Currently the only officially supported means of building the Windows
-version of POV-Ray is via the provided Visual Studio 2010 project (you
-can also use it with VS 2012) with a full version of Visual Studio and
-the compilers provided with it or with the platform SDK.
-
-The Visual Studio 2010 project is located in the "windows/vs10"
-subdirectory.
-
 Visual Studio 2015
 ------------------
 
-The Visual Studio 2010 projects should also build fine in Visual Studio 2015
-after automatic conversion, as has been tested with the Visual Studio 2015
-Community edition.
+For optimum performance, we generally recommend using Visual Studio 2015
+(Community Edition will suffice).
+
+We currently do not provide dedicated Visual Studio 2015 project files.
+Instead, simply load and auto-convert the Visual Studio 2010 projects
+located in the "windows/vs10" subdirectory.
 
 *Note:* By default, binaries generated by Visual Studio 2015 will be
 incompatible with Windows XP. If you need XP support you will have to change
 the platform toolset from |v140| to |v140_xp|, either by manually editing all
 project settings or by running the build from the command prompt with the
-environment variable |PlatformToolset| set to |v140_xp|.
+environment variable |PlatformToolset| set to |v140_xp|. However, it has been
+reported that binaries built in this manner exhibit unexpected behaviour, and
+to generate XP-compatible binaries we recommend using VS 2010 instead.
+
+Visual Studio 2010 and 2012
+---------------------------
+
+To build POV-Ray binaries with Visual Studio 2010, you will need a full
+version of Visual Studio and the compilers provided with it or with the
+platform SDK. Visual Studio 2012 has not been tested in a while, but should
+still work as well.
+
+The Visual Studio 2010 project is located in the "windows/vs10" subdirectory.
 
 Earlier Versions of Visual Studio
 ---------------------------------

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`/// @parblock`
`17`	`17`	`///`
`18`	`18`	`/// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.`
`19`		`-/// Copyright 1991-2015 Persistence of Vision Raytracer Pty. Ltd.`
	`19`	`+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.`
`20`	`20`	`///`
`21`	`21`	`/// POV-Ray is free software: you can redistribute it and/or modify`
`22`	`22`	`/// it under the terms of the GNU Affero General Public License as`
`@@ -311,7 +311,7 @@ DBL AVX2FMA3Noise(const Vector3d& EPoint, int noise_generator)`
`311`	`311`	`{`
`312`	`312`	`throw POV_EXCEPTION_STRING("Noise error");`
`313`	`313`	`}`
`314`		`-`
	`314`	`+`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`#endif`
`@@ -494,7 +494,7 @@ void AVX2FMA3DNoise(Vector3d& result, const Vector3d& EPoint)`
`494`	`494`	`{`
`495`	`495`	`throw POV_EXCEPTION_STRING("DNoise Z error");`
`496`	`496`	`}`
`497`		`-`
	`497`	`+`
`498`	`498`	`}`
`499`	`499`
`500`	`500`	`#endif`