From 408e9e02173bc243b1e416b7a56f9c1dad53d998 Mon Sep 17 00:00:00 2001 From: Mike Oliphant Date: Mon, 23 Oct 2023 13:23:20 -0700 Subject: [PATCH 1/5] Use clang with "-march=x86-64-v3" for building plugin --- NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj index 0437c417e..8a52de2dd 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj @@ -58,7 +58,7 @@ false true MultiByte - v143 + ClangCL DynamicLibrary @@ -206,6 +206,7 @@ true Speed $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + %(AdditionalOptions) -march=x86-64-v3 true From 9be777a5ea26998d2c2b9e247f346d1cb6054195 Mon Sep 17 00:00:00 2001 From: Mike Oliphant Date: Mon, 23 Oct 2023 14:00:12 -0700 Subject: [PATCH 2/5] Add the changes for the standalone app as well --- NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj index 035ef9648..4e6d758a1 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj @@ -58,7 +58,7 @@ false true MultiByte - v143 + ClangCL Application @@ -206,6 +206,7 @@ $(APP_INC_PATHS);%(AdditionalIncludeDirectories) true Speed + %(AdditionalOptions) -march=x86-64-v3 true From 2dd13844e45588ab7b0c493ef0b0a53e23b8d61f Mon Sep 17 00:00:00 2001 From: Mike Oliphant Date: Fri, 27 Oct 2023 09:46:40 -0700 Subject: [PATCH 3/5] Added "Release-Clang-x64-v3" build configuration for clang x64-v3 compiler optimizations --- .../projects/NeuralAmpModeler-vst3.vcxproj.user | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj.user b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj.user index da8be2a5b..e024d1286 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj.user +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj.user @@ -10,6 +10,11 @@ WindowsLocalDebugger $(VST3_32_COMMAND_ARGS) + + $(VST3_32_HOST_PATH) + WindowsLocalDebugger + $(VST3_32_COMMAND_ARGS) + $(VST3_32_HOST_PATH) WindowsLocalDebugger @@ -25,6 +30,11 @@ WindowsLocalDebugger $(VST3_64_COMMAND_ARGS) + + $(VST3_64_HOST_PATH) + WindowsLocalDebugger + $(VST3_64_COMMAND_ARGS) + $(VST3_64_HOST_PATH) WindowsLocalDebugger From fc3d4dfdc5dea79bda7673a888d1fa8cc10581dd Mon Sep 17 00:00:00 2001 From: Mike Oliphant Date: Fri, 27 Oct 2023 09:51:04 -0700 Subject: [PATCH 4/5] Update project files with new clang build --- NeuralAmpModeler/NeuralAmpModeler.sln | 14 ++ .../projects/NeuralAmpModeler-aax.vcxproj | 136 ++++++++++++++++++ .../projects/NeuralAmpModeler-app.vcxproj | 90 ++++++++++++ .../projects/NeuralAmpModeler-vst3.vcxproj | 89 ++++++++++++ 4 files changed, 329 insertions(+) diff --git a/NeuralAmpModeler/NeuralAmpModeler.sln b/NeuralAmpModeler/NeuralAmpModeler.sln index cdb7823e2..e0c6632aa 100644 --- a/NeuralAmpModeler/NeuralAmpModeler.sln +++ b/NeuralAmpModeler/NeuralAmpModeler.sln @@ -15,6 +15,8 @@ Global Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 + Release-Clang-x64-v3|Win32 = Release-Clang-x64-v3|Win32 + Release-Clang-x64-v3|x64 = Release-Clang-x64-v3|x64 Tracer|Win32 = Tracer|Win32 Tracer|x64 = Tracer|x64 EndGlobalSection @@ -27,6 +29,10 @@ Global {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|Win32.Build.0 = Release|Win32 {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|x64.ActiveCfg = Release|x64 {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|x64.Build.0 = Release|x64 + {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release-Clang-x64-v3|Win32.ActiveCfg = Release-Clang-x64-v3|Win32 + {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release-Clang-x64-v3|Win32.Build.0 = Release-Clang-x64-v3|Win32 + {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release-Clang-x64-v3|x64.ActiveCfg = Release-Clang-x64-v3|x64 + {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release-Clang-x64-v3|x64.Build.0 = Release-Clang-x64-v3|x64 {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|Win32.ActiveCfg = Tracer|Win32 {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|Win32.Build.0 = Tracer|Win32 {41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|x64.ActiveCfg = Tracer|x64 @@ -39,6 +45,10 @@ Global {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|Win32.Build.0 = Release|Win32 {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|x64.ActiveCfg = Release|x64 {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|x64.Build.0 = Release|x64 + {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release-Clang-x64-v3|Win32.ActiveCfg = Release-Clang-x64-v3|Win32 + {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release-Clang-x64-v3|Win32.Build.0 = Release-Clang-x64-v3|Win32 + {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release-Clang-x64-v3|x64.ActiveCfg = Release-Clang-x64-v3|x64 + {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release-Clang-x64-v3|x64.Build.0 = Release-Clang-x64-v3|x64 {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|Win32.ActiveCfg = Tracer|Win32 {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|Win32.Build.0 = Tracer|Win32 {079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|x64.ActiveCfg = Tracer|x64 @@ -51,6 +61,10 @@ Global {DC4B5920-933D-4C82-B842-F34431D55A93}.Release|Win32.Build.0 = Release|Win32 {DC4B5920-933D-4C82-B842-F34431D55A93}.Release|x64.ActiveCfg = Release|x64 {DC4B5920-933D-4C82-B842-F34431D55A93}.Release|x64.Build.0 = Release|x64 + {DC4B5920-933D-4C82-B842-F34431D55A93}.Release-Clang-x64-v3|Win32.ActiveCfg = Release-Clang-x64-v3|Win32 + {DC4B5920-933D-4C82-B842-F34431D55A93}.Release-Clang-x64-v3|Win32.Build.0 = Release-Clang-x64-v3|Win32 + {DC4B5920-933D-4C82-B842-F34431D55A93}.Release-Clang-x64-v3|x64.ActiveCfg = Release-Clang-x64-v3|x64 + {DC4B5920-933D-4C82-B842-F34431D55A93}.Release-Clang-x64-v3|x64.Build.0 = Release-Clang-x64-v3|x64 {DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|Win32.ActiveCfg = Tracer|Win32 {DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|Win32.Build.0 = Tracer|Win32 {DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|x64.ActiveCfg = Tracer|x64 diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj index 62e140914..670dc7627 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj @@ -10,6 +10,14 @@ Debug x64 + + Release-Clang-x64-v3 + Win32 + + + Release-Clang-x64-v3 + x64 + Release Win32 @@ -38,6 +46,10 @@ DynamicLibrary v143 + + DynamicLibrary + v143 + DynamicLibrary v143 @@ -50,6 +62,10 @@ DynamicLibrary v143 + + DynamicLibrary + v143 + DynamicLibrary v143 @@ -65,6 +81,10 @@ + + + + @@ -77,6 +97,10 @@ + + + + @@ -92,19 +116,25 @@ $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ false $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ false + false false $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ false $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\ $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ + $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ $(SolutionDir)build-win\aax\$(Platform)\$(Configuration)\int\ false + false false @@ -113,6 +143,9 @@ .aaxplugin + + .aaxplugin + .aaxplugin @@ -122,6 +155,9 @@ .aaxplugin + + .aaxplugin + .aaxplugin @@ -203,6 +239,48 @@ + + + + + + + + %(Outputs) + + + MaxSpeed + Speed + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + false + Async + MultiThreaded + StreamingSIMDExtensions2 + true + + + + + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + Windows + $(IntDir)$(TargetName).lib + + + + @@ -330,6 +408,52 @@ + + + + + + + + %(Outputs) + + + X64 + + + MaxSpeed + $(AAX_INC_PATHS);%(AdditionalIncludeDirectories) + $(AAX_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + false + Async + MultiThreaded + true + + + + + Level3 + ProgramDatabase + Default + %(ForcedIncludeFiles) + Speed + %(AdditionalOptions) -march=x86-64-v3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(AAX_LIBS);%(AdditionalDependencies) + $(OutDir)$(BINARY_NAME).aaxplugin + true + Windows + $(IntDir)$(TargetName).lib + MachineX64 + + + + @@ -386,15 +510,19 @@ true true true + true true + true true true true + true true true true + true @@ -421,9 +549,11 @@ $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) @@ -435,27 +565,33 @@ Document true true + true true Document true + true true true + true true Document true true + true true Document true true + true true true + true true diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj index 4e6d758a1..1f46ed8f6 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj @@ -10,6 +10,14 @@ Debug x64 + + Release-Clang-x64-v3 + Win32 + + + Release-Clang-x64-v3 + x64 + Release Win32 @@ -53,6 +61,13 @@ MultiByte v143 + + Application + false + true + MultiByte + v143 + Application false @@ -60,6 +75,13 @@ MultiByte ClangCL + + Application + false + true + MultiByte + ClangCL + Application false @@ -89,10 +111,18 @@ + + + + + + + + @@ -120,15 +150,27 @@ $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\int\ + $(SolutionDir)build-win\app\$(Platform)\$(Configuration)\ @@ -196,7 +238,49 @@ SA_API + + + Level3 + MaxSpeed + true + true + $(APP_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + true + Speed + + + true + true + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + SA_API + + + + Level3 + MaxSpeed + true + true + $(APP_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + $(APP_INC_PATHS);%(AdditionalIncludeDirectories) + true + Speed + + + true + true + $(APP_LIBS);%(AdditionalDependencies) + Windows + + + SA_API + + + Level3 MaxSpeed @@ -353,15 +437,19 @@ true true true + true true + true true true true + true true true true + true @@ -389,9 +477,11 @@ $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj index 8a52de2dd..8526a5f84 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj @@ -10,6 +10,14 @@ Debug x64 + + Release-Clang-x64-v3 + Win32 + + + Release-Clang-x64-v3 + x64 + Release Win32 @@ -53,6 +61,13 @@ MultiByte v143 + + DynamicLibrary + false + true + MultiByte + v143 + DynamicLibrary false @@ -60,6 +75,13 @@ MultiByte ClangCL + + DynamicLibrary + false + true + MultiByte + ClangCL + DynamicLibrary false @@ -89,10 +111,18 @@ + + + + + + + + @@ -122,17 +152,31 @@ $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ .vst3 + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + .vst3 + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ .vst3 + + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\int\ + .vst3 + $(SolutionDir)build-win\vst3\$(Platform)\$(Configuration)\ @@ -196,7 +240,46 @@ + + + Level3 + MaxSpeed + true + true + $(VST3_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + true + Speed + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + %(AdditionalDependencies) + ..\..\VST3_SDK\base\win\$(Platform)\$(Configuration)\;$(WDL_PATH)\IPlug\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;$(WDL_PATH)\lice\$(SolutionDir)build-win\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) + + + + + Level3 + MaxSpeed + true + true + $(VST3_DEFS);$(RELEASE_DEFS);$(EXTRA_RELEASE_DEFS);%(PreprocessorDefinitions) + true + Speed + $(VST3_INC_PATHS);%(AdditionalIncludeDirectories) + + + true + true + Windows + %(AdditionalDependencies) + + + + Level3 MaxSpeed @@ -381,17 +464,21 @@ true true true + true true true true + true true true true + true true true true + true @@ -417,9 +504,11 @@ $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) $(IntDir)%(RelativeDir) + $(IntDir)%(RelativeDir) From 48a3c750faa7cba5b7aa6ebb13d4a54a3507c752 Mon Sep 17 00:00:00 2001 From: Mike Oliphant Date: Fri, 27 Oct 2023 11:22:29 -0700 Subject: [PATCH 5/5] Switch Release config back to MSVC --- NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj | 2 +- NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj index 1f46ed8f6..f1276a3f0 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj @@ -73,7 +73,7 @@ false true MultiByte - ClangCL + v143 Application diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj index 8526a5f84..fccff2a7d 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj @@ -73,7 +73,7 @@ false true MultiByte - ClangCL + v143 DynamicLibrary