maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix scalar unit tests for all, any, maxloc, etc. that caused the ARM build 

to fail due to warnings as errors. Note that I could not reproduce the
problem locally, but based on the messages, I think this change will fix
the errors.

Differential Revision: https://reviews.llvm.org/D107120
This commit is contained in:
Mark Leair 2021-07-29 21:13:46 -07:00
parent da6626d126
commit dfe9895a52
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flang/unittests/RuntimeGTest/Reduction.cpp
View File

@ -150,8 +150,8 @@ TEST(Reductions, DoubleMaxMinNorm2) {
// A scalar result occurs when you have a rank 1 array and dim == 1. // A scalar result occurs when you have a rank 1 array and dim == 1.
std::vector<int> shape1{24}; std::vector<int> shape1{24};
auto array1{MakeArray<TypeCategory::Real, 8>(shape1, rawData)}; auto array1{MakeArray<TypeCategory::Real, 8>(shape1, rawData)};
StaticDescriptor<0, true> statDesc0; StaticDescriptor<1, true> statDesc0[1];
Descriptor &scalarResult{statDesc0.descriptor()}; Descriptor &scalarResult{statDesc0[0].descriptor()};
RTNAME(MaxlocDim) RTNAME(MaxlocDim)
(scalarResult, *array1, /*KIND=*/2, /*DIM=*/1, __FILE__, __LINE__, (scalarResult, *array1, /*KIND=*/2, /*DIM=*/1, __FILE__, __LINE__,
/*MASK=*/nullptr, /*BACK=*/false); /*MASK=*/nullptr, /*BACK=*/false);
@ -302,8 +302,8 @@ TEST(Reductions, Logical) {
std::vector<int> shape1{4}; std::vector<int> shape1{4};
auto array1{MakeArray<TypeCategory::Logical, 4>( auto array1{MakeArray<TypeCategory::Logical, 4>(
shape1, std::vector<std::int32_t>{false, false, true, true})}; shape1, std::vector<std::int32_t>{false, false, true, true})};
StaticDescriptor<0, true> statDesc0; StaticDescriptor<1, true> statDesc0[1];
Descriptor &scalarResult{statDesc0.descriptor()}; Descriptor &scalarResult{statDesc0[0].descriptor()};
RTNAME(AllDim)(scalarResult, *array1, /*DIM=*/1, __FILE__, __LINE__); RTNAME(AllDim)(scalarResult, *array1, /*DIM=*/1, __FILE__, __LINE__);
EXPECT_EQ(scalarResult.rank(), 0); EXPECT_EQ(scalarResult.rank(), 0);
EXPECT_EQ(*scalarResult.ZeroBasedIndexedElement<std::int32_t>(0), 0); EXPECT_EQ(*scalarResult.ZeroBasedIndexedElement<std::int32_t>(0), 0);
@ -501,8 +501,8 @@ TEST(Reductions, FindlocNumeric) {
std::vector<double>{0.0, -0.0, 1.0, 3.14, std::vector<double>{0.0, -0.0, 1.0, 3.14,
std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(),
std::numeric_limits<double>::infinity()})}; std::numeric_limits<double>::infinity()})};
StaticDescriptor<0, true> statDesc0; StaticDescriptor<1, true> statDesc0[1];
Descriptor &scalarResult{statDesc0.descriptor()}; Descriptor &scalarResult{statDesc0[0].descriptor()};
RTNAME(FindlocDim) RTNAME(FindlocDim)
(scalarResult, *realArray1, target, 8, /*DIM=*/1, __FILE__, __LINE__, nullptr, (scalarResult, *realArray1, target, 8, /*DIM=*/1, __FILE__, __LINE__, nullptr,
/*BACK=*/false); /*BACK=*/false);