Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Purge SSE2/SSE3 #4329

Merged
merged 7 commits into from
Apr 10, 2021
Merged

Purge SSE2/SSE3 #4329

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cf9685f
buildbot: change default target because of sse2 purge
GovanifY Mar 27, 2021
a4fae39
sln: remove SSE4 from build options, make SSE4 default
GovanifY Mar 27, 2021
7ee726f
cmake: make sse4 default
GovanifY Mar 29, 2021
b794539
gs: purge sse2/sse3
GovanifY Mar 26, 2021
16a6ffb
spu2: purge sse2
GovanifY Mar 27, 2021
814e6b5
core: purge sse2
GovanifY Mar 27, 2021
2275345
core: change sse4 fatal error to sse4.1
GovanifY Apr 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 0 additions & 90 deletions PCSX2_suite.sln
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions buildbot.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</PropertyGroup>
<ItemGroup>
<ConfigCPU Include="Debug"/>
<!--ConfigCPU Include="Debug AVX2;Debug SSE4"/-->
<!--ConfigCPU Include="Debug AVX2;Debug"/-->
</ItemGroup>
</Target>
<Target Name="DevelAll">
Expand All @@ -62,15 +62,15 @@
</PropertyGroup>
<ItemGroup>
<ConfigCPU Include="Devel"/>
<!--ConfigCPU Include="Devel AVX2;Devel SSE4"/-->
<!--ConfigCPU Include="Devel AVX2;Devel"/-->
</ItemGroup>
</Target>
<Target Name="ReleaseAll">
<PropertyGroup>
<BaseConfiguration>Release</BaseConfiguration>
</PropertyGroup>
<ItemGroup>
<ConfigCPU Include="Release AVX2;Release SSE4"/>
<ConfigCPU Include="Release AVX2;Release"/>
</ItemGroup>
</Target>
</Project>
22 changes: 0 additions & 22 deletions pcsx2/SPU2/spu2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,30 +47,8 @@ u32* cyclePtr = nullptr;
u32 lClocks = 0;
//static bool cpu_detected = false;

static bool CheckSSE()
{
return true;

#if 0
if( !cpu_detected )
{
cpudetectInit();
cpu_detected = true;
}
if( !x86caps.hasStreamingSIMDExtensions || !x86caps.hasStreamingSIMD2Extensions )
{
SysMessage( "Your CPU does not support SSE2 instructions.\nThe SPU2 plugin requires SSE2 to run." );
return false;
}
return true;
#endif
}

void SPU2configure()
{
if (!CheckSSE())
return;

ScopedCoreThreadPause paused_core;
configure();
paused_core.AllowResume();
Expand Down
10 changes: 5 additions & 5 deletions pcsx2/gui/AppInit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ void Pcsx2App::DetectCpuAndUserMode()
x86caps.CountCores();
x86caps.SIMD_EstablishMXCSRmask();

if (!x86caps.hasStreamingSIMD2Extensions)
if (!x86caps.hasStreamingSIMD4Extensions)
{
// This code will probably never run if the binary was correctly compiled for SSE2
// SSE2 is required for any decent speed and is supported by more than decade old x86 CPUs
// This code will probably never run if the binary was correctly compiled for SSE4
// SSE4 is required for any decent speed and is supported by more than decade old x86 CPUs
throw Exception::HardwareDeficiency()
.SetDiagMsg(L"Critical Failure: SSE2 Extensions not available.")
.SetUserMsg(_("SSE2 extensions are not available. PCSX2 requires a cpu that supports the SSE2 instruction set."));
.SetDiagMsg(L"Critical Failure: SSE4 Extensions not available.")
.SetUserMsg(_("SSE4 extensions are not available. PCSX2 requires a cpu that supports the SSE4 instruction set."));
}
#endif

Expand Down
3 changes: 0 additions & 3 deletions pcsx2/gui/Panels/PluginSelectorPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,20 +684,17 @@ void Panels::PluginSelectorPanel::OnEnumComplete( wxCommandEvent& evt )

int index_avx2 = -1;
int index_sse4 = -1;
int index_sse2 = -1;

for( int i = 0; i < count; i++ )
{
auto str = m_ComponentBoxes->Get(pid).GetString( i );

if( x86caps.hasAVX2 && str.Contains("AVX2") ) index_avx2 = i;
if( x86caps.hasStreamingSIMD4Extensions && str.Contains("SSE4") ) index_sse4 = i;
if( str.Contains("SSE2") ) index_sse2 = i;
}

if( index_avx2 >= 0 ) m_ComponentBoxes->Get(pid).SetSelection( index_avx2 );
else if( index_sse4 >= 0 ) m_ComponentBoxes->Get(pid).SetSelection( index_sse4 );
else if( index_sse2 >= 0 ) m_ComponentBoxes->Get(pid).SetSelection( index_sse2 );
else m_ComponentBoxes->Get(pid).SetSelection( 0 );
}
else
Expand Down
Loading