Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3e22a435a0f1
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d05fd5aae4bf
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 22, 2021

  1. Copy the full SHA
    2d630fe View commit details
  2. Copy the full SHA
    8672f04 View commit details
  3. Merge pull request #484 from someone--else/master

    Turn off AVX2 on Windows for now
    azonenberg authored May 22, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d05fd5a View commit details
Showing with 7 additions and 0 deletions.
  1. +7 −0 scopehal/scopehal.cpp
7 changes: 7 additions & 0 deletions scopehal/scopehal.cpp
Original file line number Diff line number Diff line change
@@ -125,6 +125,13 @@ void DetectCPUFeatures()
if(g_hasAvx512VL)
LogDebug("* AVX512VL\n");
LogDebug("\n");
#if defined(_WIN32) && defined(__GNUC__) // AVX2 is temporarily disabled on MingW64/GCC until this in resolved: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412
if (g_hasAvx2 || g_hasAvx512F || g_hasAvx512DQ || g_hasAvx512VL)
{
g_hasAvx2 = g_hasAvx512F = g_hasAvx512DQ = g_hasAvx512VL = false;
LogWarning("AVX2/AVX512 detected but disabled on MinGW64/GCC (see https://github.com/azonenberg/scopehal-apps/issues/295)\n");
}
#endif
}

/**