Skip to content

Commit 287ff17

Browse files
jimmytweijimmytwei
authored
ONSAM-1690 (#1937)
* Updated Windows code samples project files to use 2024.0 compiler * Updated * Update #2 * Fix for ONSAM-1690 * update
1 parent d08d661 commit 287ff17

File tree

12 files changed

+34
-678
lines changed

12 files changed

+34
-678
lines changed

‎DirectProgramming/C++SYCL/SpectralMethods/DiscreteCosineTransform/msvs/DCT.vcxproj

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Intel Performance Test|Win32">
@@ -25,20 +25,6 @@
2525
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Intel Release|Win32'" Label="Configuration">
29-
<ConfigurationType>Application</ConfigurationType>
30-
<UseDebugLibraries>false</UseDebugLibraries>
31-
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2024</PlatformToolset>
32-
<WholeProgramOptimization>true</WholeProgramOptimization>
33-
<CharacterSet>Unicode</CharacterSet>
34-
</PropertyGroup>
35-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Intel Performance Test|Win32'" Label="Configuration">
36-
<ConfigurationType>Application</ConfigurationType>
37-
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2024</PlatformToolset>
39-
<WholeProgramOptimization>true</WholeProgramOptimization>
40-
<CharacterSet>Unicode</CharacterSet>
41-
</PropertyGroup>
4228
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Intel Release|x64'" Label="Configuration">
4329
<ConfigurationType>Application</ConfigurationType>
4430
<UseDebugLibraries>false</UseDebugLibraries>
@@ -56,12 +42,6 @@
5642
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5743
<ImportGroup Label="ExtensionSettings">
5844
</ImportGroup>
59-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Intel Release|Win32'" Label="PropertySheets">
60-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
61-
</ImportGroup>
62-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Intel Performance Test|Win32'" Label="PropertySheets">
63-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
64-
</ImportGroup>
6545
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Intel Release|x64'" Label="PropertySheets">
6646
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6747
</ImportGroup>
@@ -81,52 +61,6 @@
8161
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Intel Performance Test|x64'">
8262
<LinkIncremental>false</LinkIncremental>
8363
</PropertyGroup>
84-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Intel Release|Win32'">
85-
<ClCompile>
86-
<WarningLevel>Level3</WarningLevel>
87-
<PrecompiledHeader>NotUsing</PrecompiledHeader>
88-
<Optimization>MaxSpeed</Optimization>
89-
<FunctionLevelLinking>true</FunctionLevelLinking>
90-
<IntrinsicFunctions>true</IntrinsicFunctions>
91-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
92-
<SDLCheck>true</SDLCheck>
93-
<UseProcessorExtensions>AVX</UseProcessorExtensions>
94-
<InterproceduralOptimization>NoIPO</InterproceduralOptimization>
95-
<EnableExpandedLineNumberInfo>true</EnableExpandedLineNumberInfo>
96-
<LanguageStandard>stdcpp17</LanguageStandard>
97-
<SuppressStartupBanner>true</SuppressStartupBanner>
98-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
99-
</ClCompile>
100-
<Link>
101-
<SubSystem>Console</SubSystem>
102-
<GenerateDebugInformation>true</GenerateDebugInformation>
103-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
104-
<OptimizeReferences>true</OptimizeReferences>
105-
</Link>
106-
</ItemDefinitionGroup>
107-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Intel Performance Test|Win32'">
108-
<ClCompile>
109-
<WarningLevel>Level3</WarningLevel>
110-
<PrecompiledHeader>NotUsing</PrecompiledHeader>
111-
<Optimization>MaxSpeed</Optimization>
112-
<FunctionLevelLinking>true</FunctionLevelLinking>
113-
<IntrinsicFunctions>true</IntrinsicFunctions>
114-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;PERF_NUM</PreprocessorDefinitions>
115-
<SDLCheck>true</SDLCheck>
116-
<UseProcessorExtensions>AVX</UseProcessorExtensions>
117-
<InterproceduralOptimization>NoIPO</InterproceduralOptimization>
118-
<EnableExpandedLineNumberInfo>true</EnableExpandedLineNumberInfo>
119-
<LanguageStandard>stdcpp17</LanguageStandard>
120-
<SuppressStartupBanner>true</SuppressStartupBanner>
121-
<AdditionalIncludeDirectories>$(ONEAPI_ROOT)dev-utilities\latest\include</AdditionalIncludeDirectories>
122-
</ClCompile>
123-
<Link>
124-
<SubSystem>Console</SubSystem>
125-
<GenerateDebugInformation>true</GenerateDebugInformation>
126-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
127-
<OptimizeReferences>true</OptimizeReferences>
128-
</Link>
129-
</ItemDefinitionGroup>
13064
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Intel Release|x64'">
13165
<ClCompile>
13266
<WarningLevel>Level3</WarningLevel>
@@ -183,4 +117,4 @@
183117
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
184118
<ImportGroup Label="ExtensionTargets">
185119
</ImportGroup>
186-
</Project>
120+
</Project>

‎Tools/Advisor/matrix_multiply_advisor/matrix_multiply.vcxproj

Lines changed: 3 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,16 @@
1818
<WindowsTargetPlatformVersion>$(WindowsSDKVersion.Replace("\",""))</WindowsTargetPlatformVersion>
1919
</PropertyGroup>
2020
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
21-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
22-
<ConfigurationType>Application</ConfigurationType>
23-
<UseDebugLibraries>true</UseDebugLibraries>
24-
<PlatformToolset>oneAPI Data Parallel C++ Compiler</PlatformToolset>
25-
<CharacterSet>Unicode</CharacterSet>
26-
</PropertyGroup>
27-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_THR|Win32'" Label="Configuration">
28-
<ConfigurationType>Application</ConfigurationType>
29-
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>oneAPI Data Parallel C++ Compiler</PlatformToolset>
31-
<CharacterSet>Unicode</CharacterSet>
32-
</PropertyGroup>
33-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
34-
<ConfigurationType>Application</ConfigurationType>
35-
<UseDebugLibraries>false</UseDebugLibraries>
36-
<PlatformToolset>oneAPI Data Parallel C++ Compiler</PlatformToolset>
37-
<WholeProgramOptimization>true</WholeProgramOptimization>
38-
<CharacterSet>Unicode</CharacterSet>
39-
</PropertyGroup>
40-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_THR|Win32'" Label="Configuration">
41-
<ConfigurationType>Application</ConfigurationType>
42-
<UseDebugLibraries>false</UseDebugLibraries>
43-
<PlatformToolset>oneAPI Data Parallel C++ Compiler</PlatformToolset>
44-
<WholeProgramOptimization>true</WholeProgramOptimization>
45-
<CharacterSet>Unicode</CharacterSet>
46-
</PropertyGroup>
4721
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4822
<ConfigurationType>Application</ConfigurationType>
4923
<UseDebugLibraries>true</UseDebugLibraries>
50-
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2023</PlatformToolset>
24+
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2024</PlatformToolset>
5125
<CharacterSet>Unicode</CharacterSet>
5226
</PropertyGroup>
5327
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5428
<ConfigurationType>Application</ConfigurationType>
5529
<UseDebugLibraries>false</UseDebugLibraries>
56-
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2023</PlatformToolset>
30+
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2024</PlatformToolset>
5731
<WholeProgramOptimization>true</WholeProgramOptimization>
5832
<CharacterSet>Unicode</CharacterSet>
5933
</PropertyGroup>
@@ -62,71 +36,19 @@
6236
</ImportGroup>
6337
<ImportGroup Label="Shared">
6438
</ImportGroup>
65-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
67-
</ImportGroup>
68-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_THR|Win32'" Label="PropertySheets">
69-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
70-
</ImportGroup>
71-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
72-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
73-
</ImportGroup>
74-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_THR|Win32'" Label="PropertySheets">
75-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
76-
</ImportGroup>
7739
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7840
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7941
</ImportGroup>
8042
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8143
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
8244
</ImportGroup>
8345
<PropertyGroup Label="UserMacros" />
84-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
85-
<LinkIncremental>true</LinkIncremental>
86-
</PropertyGroup>
87-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_THR|Win32'">
88-
<LinkIncremental>true</LinkIncremental>
89-
</PropertyGroup>
9046
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
9147
<LinkIncremental>true</LinkIncremental>
9248
</PropertyGroup>
93-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
94-
<LinkIncremental>false</LinkIncremental>
95-
</PropertyGroup>
96-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_THR|Win32'">
97-
<LinkIncremental>false</LinkIncremental>
98-
</PropertyGroup>
9949
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
10050
<LinkIncremental>false</LinkIncremental>
10151
</PropertyGroup>
102-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
103-
<ClCompile>
104-
<PrecompiledHeader>Use</PrecompiledHeader>
105-
<WarningLevel>Level3</WarningLevel>
106-
<Optimization>Disabled</Optimization>
107-
<SDLCheck>true</SDLCheck>
108-
<ConformanceMode>true</ConformanceMode>
109-
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
110-
</ClCompile>
111-
<Link>
112-
<SubSystem>Console</SubSystem>
113-
<GenerateDebugInformation>true</GenerateDebugInformation>
114-
</Link>
115-
</ItemDefinitionGroup>
116-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_THR|Win32'">
117-
<ClCompile>
118-
<PrecompiledHeader>Use</PrecompiledHeader>
119-
<WarningLevel>Level3</WarningLevel>
120-
<Optimization>Disabled</Optimization>
121-
<SDLCheck>true</SDLCheck>
122-
<ConformanceMode>true</ConformanceMode>
123-
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
124-
</ClCompile>
125-
<Link>
126-
<SubSystem>Console</SubSystem>
127-
<GenerateDebugInformation>true</GenerateDebugInformation>
128-
</Link>
129-
</ItemDefinitionGroup>
13052
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
13153
<ClCompile>
13254
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -148,42 +70,6 @@
14870
<SpecifyDevCmplAdditionalOptions>/Od</SpecifyDevCmplAdditionalOptions>
14971
</Link>
15072
</ItemDefinitionGroup>
151-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
152-
<ClCompile>
153-
<PrecompiledHeader>Use</PrecompiledHeader>
154-
<WarningLevel>Level3</WarningLevel>
155-
<Optimization>MaxSpeed</Optimization>
156-
<FunctionLevelLinking>true</FunctionLevelLinking>
157-
<IntrinsicFunctions>true</IntrinsicFunctions>
158-
<SDLCheck>true</SDLCheck>
159-
<ConformanceMode>true</ConformanceMode>
160-
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
161-
</ClCompile>
162-
<Link>
163-
<SubSystem>Console</SubSystem>
164-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
165-
<OptimizeReferences>true</OptimizeReferences>
166-
<GenerateDebugInformation>true</GenerateDebugInformation>
167-
</Link>
168-
</ItemDefinitionGroup>
169-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_THR|Win32'">
170-
<ClCompile>
171-
<PrecompiledHeader>Use</PrecompiledHeader>
172-
<WarningLevel>Level3</WarningLevel>
173-
<Optimization>MaxSpeed</Optimization>
174-
<FunctionLevelLinking>true</FunctionLevelLinking>
175-
<IntrinsicFunctions>true</IntrinsicFunctions>
176-
<SDLCheck>true</SDLCheck>
177-
<ConformanceMode>true</ConformanceMode>
178-
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
179-
</ClCompile>
180-
<Link>
181-
<SubSystem>Console</SubSystem>
182-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
183-
<OptimizeReferences>true</OptimizeReferences>
184-
<GenerateDebugInformation>true</GenerateDebugInformation>
185-
</Link>
186-
</ItemDefinitionGroup>
18773
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
18874
<ClCompile>
18975
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -225,4 +111,4 @@
225111
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
226112
<ImportGroup Label="ExtensionTargets">
227113
</ImportGroup>
228-
</Project>
114+
</Project>

‎Tools/Advisor/matrix_multiply_advisor/matrix_multiply.vcxproj.user

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Tools/Advisor/matrix_multiply_advisor/sample.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
}],
2222
"windows": [{
2323
"steps": [
24-
"MSBuild matrix_multiply.sln /t:Rebuild /p:Configuration=\"Release\"",
25-
"cd x64/Release",
24+
"MSBuild matrix_multiply.sln /t:Rebuild /p:Configuration=Release",
25+
"cd x64\\Release",
2626
"matrix_multiply.exe"
2727
]
2828
}]

0 commit comments

Comments
 (0)