Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2039ad7 authored by Michael Butler's avatar Michael Butler
Browse files

Added protections for RenderScript VTS tests. 

Changed many EXPECT_NE to ASSERT_NE for objects that are required later
in the test which would potentially cause a segfault. Additionally updated
a few descriptions.

Bug: 35915961

Test: mm and run on angler
Change-Id: I17c85b2c774688d82b59be2f0b383447e03349e0
parent b26fea26

renderscript/1.0/vts/functional/VtsCopyTests.cpp

+71 −4
Original line number Diff line number Diff line
@@ -30,12 +30,18 @@ 
TEST_F(RenderscriptHidlTest, Simple1DCopyTest) {

    // float1

    Element element = context->elementCreate(DataType::FLOAT_32, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element);



    // 128 x float1

    Type type = context->typeCreate(element, 128, 0, 0, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), type);



    // 128 x float1

    Allocation allocation = context->allocationCreateTyped(type, AllocationMipmapControl::NONE,

                                                           (int)AllocationUsageType::SCRIPT,

                                                           (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocation);



    std::vector<float> dataIn(128), dataOut(128);

    std::generate(dataIn.begin(), dataIn.end(), [](){ static int val = 0; return (float)val++; });

    hidl_vec<uint8_t> _data;
@@ -60,12 +66,18 @@ TEST_F(RenderscriptHidlTest, Simple1DCopyTest) { 
TEST_F(RenderscriptHidlTest, Simple2DCopyTest) {

    // float1

    Element element = context->elementCreate(DataType::FLOAT_32, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element);



    // 128 x 128 x float1

    Type type = context->typeCreate(element, 128, 128, 0, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), type);



    // 128 x 128 x float1

    Allocation allocation = context->allocationCreateTyped(type, AllocationMipmapControl::NONE,

                                                           (int)AllocationUsageType::SCRIPT,

                                                           (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocation);



    std::vector<float> dataIn(128*128), dataOut(128*128);

    std::generate(dataIn.begin(), dataIn.end(), [](){ static int val = 0; return (float)val++; });

    hidl_vec<uint8_t> _data;
@@ -91,12 +103,18 @@ TEST_F(RenderscriptHidlTest, Simple2DCopyTest) { 
TEST_F(RenderscriptHidlTest, Simple3DCopyTest) {

    // float1

    Element element = context->elementCreate(DataType::FLOAT_32, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element);



    // 32 x 32 x 32 x float1

    Type type = context->typeCreate(element, 32, 32, 32, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), type);



    // 32 x 32 x 32 x float1

    Allocation allocation = context->allocationCreateTyped(type, AllocationMipmapControl::NONE,

                                                           (int)AllocationUsageType::SCRIPT,

                                                           (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocation);



    std::vector<float> dataIn(32*32*32), dataOut(32*32*32);

    std::generate(dataIn.begin(), dataIn.end(), [](){ static int val = 0; return (float)val++; });

    hidl_vec<uint8_t> _data;
@@ -122,8 +140,12 @@ TEST_F(RenderscriptHidlTest, Simple3DCopyTest) { 
TEST_F(RenderscriptHidlTest, SimpleBitmapTest) {

    // float1

    Element element = context->elementCreate(DataType::FLOAT_32, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element);



    // 512 x 512 x float1

    Type type = context->typeCreate(element, 512, 512, 0, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), type);



    std::vector<float> dataIn(512*512), dataOut1(512*512), dataOut2(512*512);

    std::generate(dataIn.begin(), dataIn.end(), [](){ static int val = 0; return (float)val++; });

    hidl_vec<uint8_t> _data;
@@ -133,7 +155,7 @@ TEST_F(RenderscriptHidlTest, SimpleBitmapTest) { 
                                                                AllocationMipmapControl::NONE,

                                                                _data,

                                                                (int)AllocationUsageType::SCRIPT);

    EXPECT_NE(Allocation(0), allocation);

    ASSERT_NE(Allocation(0), allocation);



    context->allocationCopyToBitmap(allocation, (Ptr)dataOut1.data(),

                                    (Size)dataOut1.size()*sizeof(float));
@@ -158,10 +180,16 @@ TEST_F(RenderscriptHidlTest, SimpleBitmapTest) { 
TEST_F(RenderscriptHidlTest, AllocationCopy2DRangeTest) {

    // float1

    Element element = context->elementCreate(DataType::FLOAT_32, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element);



    // 512 x 512 x float1

    Type typeSrc = context->typeCreate(element, 512, 512, 0, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), typeSrc);



    // 256 x 256 x float1

    Type typeDst = context->typeCreate(element, 256, 256, 0, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), typeDst);



    std::vector<float> dataIn(512*512), dataOut(256*256), expected(256*256);

    std::generate(dataIn.begin(), dataIn.end(), [](){ static int val = 0; return (float)val++; });

    hidl_vec<uint8_t> _data;
@@ -170,10 +198,14 @@ TEST_F(RenderscriptHidlTest, AllocationCopy2DRangeTest) { 
    Allocation allocSrc = context->allocationCreateFromBitmap(typeSrc,

                                                              AllocationMipmapControl::NONE, _data,

                                                              (int)AllocationUsageType::SCRIPT);

    ASSERT_NE(Allocation(0), allocSrc);



    // 256 x 256 x float1

    Allocation allocDst = context->allocationCreateTyped(typeDst, AllocationMipmapControl::NONE,

                                                         (int)AllocationUsageType::SCRIPT,

                                                         (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocDst);



    context->allocationCopy2DRange(allocDst, 0, 0, 0, AllocationCubemapFace::POSITIVE_X, 256, 256,

                                   allocSrc, 128, 128, 0, AllocationCubemapFace::POSITIVE_X);

    context->allocationRead(allocDst, (Ptr)dataOut.data(), (Size)dataOut.size()*sizeof(float));
@@ -200,10 +232,16 @@ TEST_F(RenderscriptHidlTest, AllocationCopy2DRangeTest) { 
TEST_F(RenderscriptHidlTest, AllocationCopy3DRangeTest) {

    // float1

    Element element = context->elementCreate(DataType::FLOAT_32, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element);



    // 128 x 128 x 128 x float1

    Type typeSrc = context->typeCreate(element, 128, 128, 128, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), typeSrc);



    // 64 x 64 x 64 x float1

    Type typeDst = context->typeCreate(element, 64, 64, 64, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), typeDst);



    std::vector<float> dataIn(128*128*128), dataOut(64*64*64), expected(64*64*64);

    std::generate(dataIn.begin(), dataIn.end(), [](){ static int val = 0; return (float)val++; });

    hidl_vec<uint8_t> _data;
@@ -212,10 +250,14 @@ TEST_F(RenderscriptHidlTest, AllocationCopy3DRangeTest) { 
    Allocation allocSrc = context->allocationCreateTyped(typeSrc, AllocationMipmapControl::NONE,

                                                         (int)AllocationUsageType::SCRIPT,

                                                         (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocSrc);



    // 256 x 256 x float1

    Allocation allocDst = context->allocationCreateTyped(typeDst, AllocationMipmapControl::NONE,

                                                         (int)AllocationUsageType::SCRIPT,

                                                         (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocDst);



    context->allocation3DWrite(allocSrc, 0, 0, 0, 0, 128, 128, 128, _data, 128*sizeof(float));

    context->allocationCopy3DRange(allocDst, 0, 0, 0, 0, 64, 64, 64, allocSrc, 32, 32, 32, 0);

    context->allocationRead(allocDst, (Ptr)dataOut.data(), (Size)dataOut.size()*sizeof(float));
@@ -243,8 +285,12 @@ TEST_F(RenderscriptHidlTest, AllocationCopy3DRangeTest) { 
TEST_F(RenderscriptHidlTest, SimpleAdapterTest) {

    // float1

    Element element = context->elementCreate(DataType::FLOAT_32, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element);



    // 512 x 512 x float1

    Type type = context->typeCreate(element, 512, 512, 0, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), type);



    std::vector<float> dataIn(512*512), dataOut(256*256), expected;

    std::generate(dataIn.begin(), dataIn.end(), [](){ static int val = 0; return (float)val++; });

    hidl_vec<uint8_t> _data;
@@ -254,11 +300,15 @@ TEST_F(RenderscriptHidlTest, SimpleAdapterTest) { 
                                                                AllocationMipmapControl::NONE,

                                                                _data,

                                                                (int)AllocationUsageType::SCRIPT);

    ASSERT_NE(Allocation(0), allocation);



    // 256 x 256 x float1

    Type subType = context->typeCreate(element, 256, 256, 0, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), subType);



    // 256 x 256 x float1

    AllocationAdapter allocationAdapter = context->allocationAdapterCreate(subType, allocation);

    EXPECT_NE(AllocationAdapter(0), allocationAdapter);

    ASSERT_NE(AllocationAdapter(0), allocationAdapter);



    std::vector<uint32_t> offsets(9, 0);

    offsets[0] = 128;
@@ -292,8 +342,12 @@ TEST_F(RenderscriptHidlTest, SimpleAdapterTest) { 
TEST_F(RenderscriptHidlTest, SimpleMipmapTest) {

    // uint8_t

    Element element = context->elementCreate(DataType::UNSIGNED_8, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element);



    // 64 x 64 x uint8_t

    Type type = context->typeCreate(element, 64, 64, 0, true, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), type);



    std::vector<uint8_t> dataIn(64*64), dataOut(32*32), expected(32*32);

    std::generate(dataIn.begin(), dataIn.end(),

                  [](){ static int val = 0; return (uint8_t)(0xFF & val++); });
@@ -303,6 +357,8 @@ TEST_F(RenderscriptHidlTest, SimpleMipmapTest) { 
    Allocation allocation = context->allocationCreateTyped(type, AllocationMipmapControl::FULL,

                                                         (int)AllocationUsageType::SCRIPT,

                                                         (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocation);



    context->allocation2DWrite(allocation, 0, 0, 0, AllocationCubemapFace::POSITIVE_X, 64, 64,

                               _data, 64*sizeof(uint8_t));

    context->allocationGenerateMipmaps(allocation);
@@ -333,8 +389,12 @@ TEST_F(RenderscriptHidlTest, SimpleMipmapTest) { 
TEST_F(RenderscriptHidlTest, SimpleCubemapTest) {

    // float1

    Element element = context->elementCreate(DataType::FLOAT_32, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element);



    // 128 x 128 x float1

    Type type = context->typeCreate(element, 128, 128, 0, false, true, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), type);



    std::vector<float> dataIn(128*128*6), dataOut(128*128), expected(128*128);

    std::generate(dataIn.begin(), dataIn.end(), [](){ static int val = 0; return (float)val++; });

    hidl_vec<uint8_t> _data;
@@ -342,7 +402,7 @@ TEST_F(RenderscriptHidlTest, SimpleCubemapTest) { 
    // 128 x 128 x float1 x 6

    Allocation allocation = context->allocationCubeCreateFromBitmap(

        type, AllocationMipmapControl::NONE, _data, (int)AllocationUsageType::SCRIPT);

    EXPECT_NE(Allocation(0), allocation);

    ASSERT_NE(Allocation(0), allocation);



    context->allocation2DRead(allocation, 0, 0, 0, AllocationCubemapFace::NEGATIVE_Z, 128,

                              128, (Ptr)dataOut.data(), (Size)dataOut.size()*sizeof(float),
@@ -367,13 +427,16 @@ TEST_F(RenderscriptHidlTest, SimpleCubemapTest) { 
 */

TEST_F(RenderscriptHidlTest, ComplexElementTest) {

    Element element1 = context->elementCreate(DataType::UNSIGNED_8, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element1);



    Element element2 = context->elementCreate(DataType::UNSIGNED_32, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element2);



    hidl_vec<Element> eins = {element1, element2};

    hidl_vec<hidl_string> names = {hidl_string("first"), hidl_string("second")};

    hidl_vec<Size> arraySizesPtr = {1, 1};

    Element element3 = context->elementComplexCreate(eins, names, arraySizesPtr);

    EXPECT_NE(Element(0), element3);

    ASSERT_NE(Element(0), element3);



    std::vector<Element> ids;

    std::vector<std::string> namesOut;
@@ -395,10 +458,14 @@ TEST_F(RenderscriptHidlTest, ComplexElementTest) { 


    // 1 x (uint8_t, uint32_t)

    Type type = context->typeCreate(element3, 1, 0, 0, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), type);



    // 1 x (uint8_t, uint32_t)

    Allocation allocation = context->allocationCreateTyped(type, AllocationMipmapControl::NONE,

                                                           (int)AllocationUsageType::SCRIPT,

                                                           (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocation);



    std::vector<uint32_t> dataIn(1), dataOut(1);

    std::generate(dataIn.begin(), dataIn.end(), [](){ static uint32_t val = 0; return val++; });

    hidl_vec<uint8_t> _data;

renderscript/1.0/vts/functional/VtsMiscellaneousTests.cpp

+42 −9
Original line number Diff line number Diff line
@@ -46,18 +46,18 @@ TEST_F(RenderscriptHidlTest, ElementCreate) { 
TEST_F(RenderscriptHidlTest, ElementTypeAllocationCreate) {

    // Element create test

    Element element = context->elementCreate(DataType::FLOAT_32, DataKind::USER, false, 1);

    EXPECT_NE(Element(0), element);

    ASSERT_NE(Element(0), element);



    // Type create test

    Type type = context->typeCreate(element, 1, 0, 0, false, false, YuvFormat::YUV_NONE);

    EXPECT_NE(Type(0), type);

    ASSERT_NE(Type(0), type);



    // Allocation create test

    Allocation allocation = context->allocationCreateTyped(type, AllocationMipmapControl::NONE,

                                                           (int)((uint32_t)AllocationUsageType::ALL

                                                           & ~(uint32_t)AllocationUsageType::OEM),

                                                           (Ptr)nullptr);

    EXPECT_NE(Allocation(0), allocation);

    ASSERT_NE(Allocation(0), allocation);



    // Allocation type test

    Type type2 = context->allocationGetType(allocation);
@@ -74,8 +74,11 @@ TEST_F(RenderscriptHidlTest, ElementTypeAllocationCreate) { 
TEST_F(RenderscriptHidlTest, MetadataTest) {

    // float1

    Element element = context->elementCreate(DataType::FLOAT_32, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element);



    // 128 x float1

    Type type = context->typeCreate(element, 128, 0, 0, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), type);



    std::vector<uint32_t> elementMetadata(5);

    context->elementGetNativeMetadata(element, [&](const hidl_vec<uint32_t>& _metadata){
@@ -107,24 +110,30 @@ TEST_F(RenderscriptHidlTest, MetadataTest) { 
TEST_F(RenderscriptHidlTest, ResizeTest) {

    // float1

    Element element = context->elementCreate(DataType::FLOAT_32, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element);



    // 128 x float1

    Type type = context->typeCreate(element, 128, 0, 0, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), type);



    // 128 x float1

    Allocation allocation = context->allocationCreateTyped(type, AllocationMipmapControl::NONE,

                                                           (int)AllocationUsageType::SCRIPT,

                                                           (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocation);



    Ptr dataPtr1, dataPtr2;

    Size stride;

    context->allocationGetPointer(allocation, 0, AllocationCubemapFace::POSITIVE_X, 0,

                                  [&](Ptr _dataPtr, Size _stride){

                                      dataPtr1 = _dataPtr; stride = _stride; });

    EXPECT_EQ(0ul, stride);

    EXPECT_EQ(Size(0), stride);



    context->allocationResize1D(allocation, 1024*1024);

    context->allocationGetPointer(allocation, 0, AllocationCubemapFace::POSITIVE_X, 0,

                                  [&](Ptr _dataPtr, Size _stride){

                                      dataPtr2 = _dataPtr; stride = _stride; });

    EXPECT_EQ(0ul, stride);

    EXPECT_EQ(Size(0), stride);

    EXPECT_NE(dataPtr1, dataPtr2);

}
@@ -139,8 +148,12 @@ TEST_F(RenderscriptHidlTest, ResizeTest) { 
TEST_F(RenderscriptHidlTest, NativeWindowIoTest) {

    // uint8x4

    Element element = context->elementCreate(DataType::UNSIGNED_8, DataKind::USER, false, 4);

    ASSERT_NE(Element(0), element);



    // 512 x 512 x uint8x4

    Type type = context->typeCreate(element, 512, 512, 0, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), type);



    std::vector<uint32_t> dataIn(512*512), dataOut(512*512);

    std::generate(dataIn.begin(), dataIn.end(), [](){ static uint32_t val = 0; return val++; });

    hidl_vec<uint8_t> _data;
@@ -150,12 +163,16 @@ TEST_F(RenderscriptHidlTest, NativeWindowIoTest) { 
                                                               (int)(AllocationUsageType::SCRIPT

                                                               | AllocationUsageType::IO_INPUT),

                                                               (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocationRecv);



    Allocation allocationSend = context->allocationCreateTyped(type, AllocationMipmapControl::NONE,

                                                               (int)(AllocationUsageType::SCRIPT

                                                               | AllocationUsageType::IO_OUTPUT),

                                                               (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocationSend);



    NativeWindow nativeWindow = context->allocationGetNativeWindow(allocationRecv);

    EXPECT_NE(NativeWindow(0), nativeWindow);

    ASSERT_NE(NativeWindow(0), nativeWindow);



    ((ANativeWindow *)nativeWindow)->incStrong(nullptr);
@@ -174,14 +191,20 @@ TEST_F(RenderscriptHidlTest, NativeWindowIoTest) { 
 * two allocations with IO_INPUT are made to share the same BufferQueue.

 *

 * Calls: elementCreate, typeCreate, allocationCreateTyped,

 * allocationCreateFromBitmap, allocationSetupBufferQueue,

 * allocationShareBufferQueue

 * allocationSetupBufferQueue, allocationShareBufferQueue,

 * allocationGetNativeWindow, allocationSetNativeWindow,

 * allocation2DWrite, allocation2DRead, allocationIoSend,

 * allocationIoReceive

 */

TEST_F(RenderscriptHidlTest, BufferQueueTest) {

    // uint8x4

    Element element = context->elementCreate(DataType::UNSIGNED_8, DataKind::USER, false, 4);

    ASSERT_NE(Element(0), element);



    // 512 x 512 x uint8x4

    Type type = context->typeCreate(element, 512, 512, 0, false, false, YuvFormat::YUV_NONE);

    ASSERT_NE(Type(0), type);



    std::vector<uint32_t> dataIn(512*512), dataOut1(512*512), dataOut2(512*512);

    std::generate(dataIn.begin(), dataIn.end(), [](){ static uint32_t val = 0; return val++; });

    hidl_vec<uint8_t> _data;
@@ -191,20 +214,28 @@ TEST_F(RenderscriptHidlTest, BufferQueueTest) { 
                                                                (int)(AllocationUsageType::SCRIPT

                                                                | AllocationUsageType::IO_INPUT),

                                                                (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocationRecv1);



    Allocation allocationRecv2 = context->allocationCreateTyped(type, AllocationMipmapControl::NONE,

                                                                (int)(AllocationUsageType::SCRIPT

                                                                | AllocationUsageType::IO_INPUT),

                                                                (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocationRecv2);



    Allocation allocationSend  = context->allocationCreateTyped(type, AllocationMipmapControl::NONE,

                                                                (int)(AllocationUsageType::SCRIPT

                                                                | AllocationUsageType::IO_INPUT),

                                                                (Ptr)nullptr);

    ASSERT_NE(Allocation(0), allocationSend);



    context->allocationSetupBufferQueue(allocationRecv1, 2);

    context->allocationShareBufferQueue(allocationRecv2, allocationRecv1);



    NativeWindow nativeWindow1 = context->allocationGetNativeWindow(allocationRecv1);

    EXPECT_NE(NativeWindow(0), nativeWindow1);

    ASSERT_NE(NativeWindow(0), nativeWindow1);



    NativeWindow nativeWindow2 = context->allocationGetNativeWindow(allocationRecv2);

    ASSERT_NE(NativeWindow(0), nativeWindow2);

    EXPECT_EQ(nativeWindow2, nativeWindow1);



    ((ANativeWindow *)nativeWindow1)->incStrong(nullptr);
@@ -269,6 +300,8 @@ TEST_F(RenderscriptHidlTest, MiscellaneousTests) { 
    context->contextSetCacheDir("/data/local/tmp/temp/");



    Element element = context->elementCreate(DataType::UNSIGNED_8, DataKind::USER, false, 1);

    ASSERT_NE(Element(0), element);



    std::string nameIn = "element_test_name";

    std::string nameOut = "not_name";

    hidl_string _nameIn;

renderscript/1.0/vts/functional/VtsScriptTests.cpp

+83 −28

File changed.

Preview size limit exceeded, changes collapsed.