diff --git a/autotest/SIMD/Etalon.log b/autotest/SIMD/Etalon.log index 00079a105..814c01753 100644 --- a/autotest/SIMD/Etalon.log +++ b/autotest/SIMD/Etalon.log @@ -53,7 +53,6 @@ AllTrue(x == y) = false AllTrue(x == x) = true x + y = 2 6 5 7 x - y = 0 -2 1 1 -x * y = 0 1 0 8 0 6 0 12 ---------------- x = 1.1 2.8 3.7 -4.2 Truncate(x) = 1 2 3 -4 diff --git a/autotest/SIMD/SIMD.cpp b/autotest/SIMD/SIMD.cpp index ed26dfa26..bbf0ad16a 100644 --- a/autotest/SIMD/SIMD.cpp +++ b/autotest/SIMD/SIMD.cpp @@ -87,7 +87,6 @@ CONSOLE_APP_MAIN DUMP(x + y); DUMP(x - y); - DUMP(x * y); } { diff --git a/autotest/SIMD2/Etalon.log b/autotest/SIMD2/Etalon.log index d063abc91..d6b35e310 100644 --- a/autotest/SIMD2/Etalon.log +++ b/autotest/SIMD2/Etalon.log @@ -1,4 +1,4 @@ -* C:\upp\out\upptst\MSBT19.Debug.Debug_Full\SIMD2.exe 27.07.2020 17:35:09, user: cxl +* C:\upp\out\autotest\MSBT19.Debug.Debug_Full\SIMD2.exe 28.07.2020 09:40:44, user: cxl f32x4(r) = 0 0 0 0 x = 4 3 2 1 @@ -72,6 +72,8 @@ AllTrue(a < b) = true AllTrue(b < a) = false AllTrue(a > b) = false AllTrue(b > a) = true +s = 1000 2000 4000 8000 16000 20000 25000 3000 +s >> 7 = 7 15 31 62 125 156 195 23 ========================================================== x = 0 0 0 1 x = 0 0 2 1 diff --git a/autotest/SIMD2/SIMD2.cpp b/autotest/SIMD2/SIMD2.cpp index f959a2635..3ffa3c2f7 100644 --- a/autotest/SIMD2/SIMD2.cpp +++ b/autotest/SIMD2/SIMD2.cpp @@ -148,6 +148,10 @@ CONSOLE_APP_MAIN DUMP(AllTrue(a > b)); DUMP(AllTrue(b > a)); + + i16x8 s(1000, 2000, 4000, 8000, 16000, 20000, 25000, 3000); + DUMP(s); + DUMP(s >> 7); } { @@ -364,13 +368,17 @@ CONSOLE_APP_MAIN } auto LoadLog = [](const String& path) { - String s = LoadFile(path); + String s = Filter(LoadFile(path), [](int c) { return c == '\r' ? 0 : c; }); return s.Mid(max(s.FindAfter("\n"), 0)); }; String log = LoadLog(GetStdLogPath()); + String etalon = LoadLog(GetDataFile("Etalon.log")); - ASSERT(LoadLog(GetStdLogPath()) == LoadLog(GetDataFile("Etalon.log"))); + SaveFile(GetHomeDirFile("log.txt"), log); + SaveFile(GetHomeDirFile("etalon.txt"), etalon); + + ASSERT(log == etalon); Cout() << "================= OK\r\n"; }