同步主干vkgl代码至branch-1018

Signed-off-by: Nbayanxing <bayanxing@kaihong.com>

graphic/BUILD.gn

@@ -20,6 +20,7 @@ group("graphic") {
       "graphicColorSpace:ActsColorSpaceManagerTest",
       "graphicnapidrawingtest:ActsGraphicNapiDrawingTest",
       "graphicnapitest:ActsGraphicNapiTest",
+      "vkgl:cpvkgl",
       "webGL:webGL_hap_test",
       "windowStage:ActsWindowStageTest",
       "windowstandard:window_hap_test",

graphic/vkgl/BUILD.gn

@@ -128,13 +128,24 @@ group("VKGLCTSTest") {
     "src/khrgles31/build0004:ActsKhrgles31TestSuite0004",
     "src/khrgles32/build0001:ActsKhrgles32TestSuite0001",
     "src/khrgles32/build0002:ActsKhrgles32TestSuite0002",
-    "src/khrgles32single/build0001:ActsKhrgles32singleTestSuite0001",
-    "src/khrgles32single/build0002:ActsKhrgles32singleTestSuite0002",
-    "src/khrgles32single/build0003:ActsKhrgles32singleTestSuite0003",
-    "src/khrgles32single/build0004:ActsKhrgles32singleTestSuite0004",
-    "src/khrgles32single/build0005:ActsKhrgles32singleTestSuite0005",
-    "src/khrgles32single/build0006:ActsKhrgles32singleTestSuite0006",
-    "src/khrgles32single/build0007:ActsKhrgles32singleTestSuite0007",
+
+    #"src/khrgles32single/build0001:ActsKhrgles32singleTestSuite0001",
+    #"src/khrgles32single/build0002:ActsKhrgles32singleTestSuite0002",
+    #"src/khrgles32single/build0003:ActsKhrgles32singleTestSuite0003",
+    #"src/khrgles32single/build0004:ActsKhrgles32singleTestSuite0004",
+    #"src/khrgles32single/build0005:ActsKhrgles32singleTestSuite0005",
+    #"src/khrgles32single/build0006:ActsKhrgles32singleTestSuite0006",
+    #"src/khrgles32single/build0007:ActsKhrgles32singleTestSuite0007",
     "src/khrglesext/build0001:ActsKhrglesextTestSuite0001",
   ]
 }
+
+action("cpvkgl") {
+  testonly = true
+  script = "cpvkgl.sh"
+  outputs = [ "${target_out_dir}/cpvkgl.log" ]
+  deps = [
+    ":VKGLCTSTest",
+    "//third_party/vk-gl-cts/framework/platform:glcts",
+  ]
+}

graphic/vkgl/README_zh.md

+### vkgl 测试框架介绍
+
+#### 概要说明
+
+vkgl 是基于开源库VK-GL-CTS（版本：opengl-es-cts-3.2.8），进行移植开发的OpenHarmony的测试套件，目录结构如下：
+
+```bash
+.
+├── BUILD.gn				//编译配置
+├── comm.gni				//共同编译参数
+├── cpvkgl.sh				//编译打包脚本，负责打包依赖so库和依赖测试数据
+└── src
+    ├── ActsApp.cpp			//测试项调用入口
+    ├── ActsApp.h			
+    ├── deqpgles2			//deqp gles2测试用例suite
+    ├── deqpgles3			//deqp gles3测试用例suite
+    ├── deqpgles31			//deqp gles31测试用例suite
+    ├── khrgles2			//khr gles2测试用例suite
+    ├── khrgles3			//khr gles3测试用例suite
+    ├── khrgles31			//khr gles31测试用例suite
+    ├── khrgles32			//khr gles32测试用例suite
+    ├── khrglesext			//khr glesext测试用例suite
+    ├── logdefine.h			//测试结果数据收集定义
+    └── shrinkdefine.h		//测试框架简化定义
+```
+
+其中具体测试项目为：
+
+* deqpgles2：对应vk-gl-cts库的 gles2.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择deqp的case，共包括用例16492条，
+* deqpgles3：对应vk-gl-cts库的 gles3.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择deqp的case，共包括用例44389条，
+* deqpgles31：对应vk-gl-cts库的 gles31.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择deqp的case，共包括用例37854条，
+* khrgles2：对应vk-gl-cts库的 gles2-khr.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择khr的case，共包括用例472条，
+* khrgles3：对应vk-gl-cts库的 gles3-khr.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择khr的case，共包括用例4079条
+* khrgles31：对应vk-gl-cts库的 gles31-khr.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择khr的case，共包括用例3497条
+* khrglesext：对应vk-gl-cts库的 glesext-khr.txt，路径为external/openglcts/data/mustpass,在此路径下有deqp和khr两种，在此我们选择khr的case，共包括用例335条
+
+测试套件执行流程为：
+```mermaid
+graph LR
+测试套件 --> ActsApp --> 三方库vkgl执行单元
+```
+
+#### 适配说明
+
+* vkgl 测试依赖于三方库内的vk-gl-cts库，以及glslang，spirv-headers，spirv-tools三个库，对应关系如下：
+
+```mermaid
+graph LR
+vkgl --> vk-gl-cts --> glslang
+vk-gl-cts --> spirv-headers
+vk-gl-cts --> spirv-tools
+```
+
+* vk-gl-cts适配方式：在vk-gl-cts/framework/platform内增加OpenHarmony适配目录，适配目录内增加ohos适配层，针对rosen图形框架进行适配，实现对gpu驱动的加载和对应图形API的测试。
+
+  ```bash
+  vk-gl-cts/framework/platform
+  ├── android
+  ├── BUILD.gn
+  ├── CMakeLists.txt
+  ├── ios
+  ├── lnx
+  ├── null
+  ├── nullws
+  ├── ohos								//OpenHarmony适配目录
+  │   ├── context
+  │   ├── display
+  │   ├── rosen_context
+  │   ├── tcuOhosPlatform.cpp
+  │   ├── tcuOhosPlatform.hpp
+  ├── osx
+  ├── raspi
+  ├── surfaceless
+  ├── tcuMain.cpp
+  ├── vanilla
+  └── win32
+  ```
+
+
+* vkgl测试套件的编译：
+
+  * 在test/xts/acts/graphic/BUILD.gn里增加deps，如下：
+
+    ```bash
+    import("//build/ohos_var.gni")
+    group("graphic") {
+      testonly = true
+      if (is_standard_system) {
+        deps = [
+          "webGL:webGL_hap_test",
+          "windowstandard:window_hap_test",
+          #增加下面内容------------------------------------------
+          "vkgl:cpvkgl",				//vkgl测试套件入口包括vkgl测试，测试打包脚本
+          #到此为止---------------------------------------------
+        ]
+      } else {
+        deps = [
+          "appaccount:appaccount_hap",
+          "osaccount:osaccount_hap",
+        ]
+      }
+    }
+    ```
+
+
+  * vkgl测试套件的编译命令（源码根目录执行）：
+
+    ```bash
+    ./build.sh --product-name rk3568 --gn-args build_xts=true --build-target "acts" --gn-args is_standard_system=true
+    ```
+
+#### 使用说明
+
+* vkgl测试套件编译完成后生成的**测试套件**使用流程如下：
+
+  * vkgl**测试套件**会输出测试程序至两个路径：
+
+    1. out/rk3568/suites/acts/testcases/
+
+       此路径下包括测试程序和vkgldata测试依赖库和测试数据包，具体如下：
+
+       ```bash
+       ├── libdeqp_ohos_platform.z.so
+       ├── libdeqp_SPIRV.z.so
+       ├── libdeqp_SPVRemapper.z.so
+       ├── librosen_context.z.so
+       └── vkgldata.tar.gz
+       ```
+       
+    2. out/rk3568/common/common
+
+       此路径下的测试程序为glcts，可以直接拷贝至设备上运行，运行命令如下：
+       
+       ```bash
+       ./glcts --deqp-case=dEQP-GLES2.*
+       ```
+       
+       --deqp-case=参数目前支持：dEQP-GLES2，dEQP-GLES3, dEQP-GLES31, KHR-GLES2, KHR-GLES3, KHR-GLES31, 号意思就是后面的全部，所以如果指定具体case就写完整路径
+       
+       --deqp-caselist-file=参数支持直接传txt文件进行测试
+
+  * vkgl测试套件运行结束会生成qpa文件方便开发人员调试，qpa文件可以通过vk-gl-cts/scripts/log内的脚本进行解析，具体命令如下：
+
+    ```bash
+    python2 log_to_xml.py TestResults.qpa TestResults.xml
+    ```

graphic/vkgl/comm.gni

@@ -14,103 +14,101 @@
 import("//test/xts/tools/build/suite.gni")
 
 common_include = [
-  "//test/xts/acts/graphic/vkglcts/src",
-  "//foundation/graphic/standard/rosen/modules/2d_graphics/include",
-  "//foundation/graphic/standard/rosen/modules/2d_graphics/src",
-  "//foundation/graphic/standard/rosen/modules/render_service_base/src",
-  "//foundation/graphic/standard/rosen/modules/render_service_base/include",
-  "//foundation/graphic/standard/rosen/modules/render_service_client",
-  "//foundation/graphic/standard/interfaces/innerkits/vsync_module",
-  "//foundation/graphic/standard/rosen/include/common",
+  ".",
+  "//test/xts/acts/graphic/vkgl/src",
+  "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
+  "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
+  "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/src",
+  "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
+  "//foundation/graphic/graphic_2d/rosen/modules/render_service_client",
+  "//foundation/graphic/graphic_2d/interfaces/innerkits/vsync_module",
+  "//foundation/graphic/graphic_2d/rosen/include/common",
   "//foundation/window/window_manager/interfaces/innerkits/wm",
-  "//third_party/VK-GL-CTS",
-  "//third_party/VK-GL-CTS/framework/delibs/debase",
-  "//third_party/VK-GL-CTS/framework/delibs/decpp",
-  "//third_party/VK-GL-CTS/framework/delibs/depool",
-  "//third_party/VK-GL-CTS/framework/delibs/dethread",
-  "//third_party/VK-GL-CTS/framework/delibs/deutil",
-  "//third_party/VK-GL-CTS/framework/delibs/destream",
-  "//third_party/VK-GL-CTS/framework/common",
-  "//third_party/VK-GL-CTS/framework/qphelper",
-  "//third_party/VK-GL-CTS/framework/xexml",
-  "//third_party/VK-GL-CTS/framework/egl",
-  "//third_party/VK-GL-CTS/framework/egl/wrapper",
-  "//third_party/VK-GL-CTS/framework/opengl",
-  "//third_party/VK-GL-CTS/framework/opengl/wrapper",
-  "//third_party/VK-GL-CTS/framework/opengl/simplereference",
-  "//third_party/VK-GL-CTS/framework/platform/ohos",
-  "//third_party/VK-GL-CTS/external/libpng/src",
-  "//third_party/VK-GL-CTS/external/openglcts/modules",
-  "//third_party/VK-GL-CTS/external/openglcts/modules/common",
-  "//third_party/VK-GL-CTS/external/openglcts/modules/gl",
-  "//third_party/VK-GL-CTS/external/openglcts/modules/gles2",
-  "//third_party/VK-GL-CTS/external/openglcts/modules/gles3",
-  "//third_party/VK-GL-CTS/external/openglcts/modules/gles31",
-  "//third_party/VK-GL-CTS/external/openglcts/modules/gles32",
-  "//third_party/VK-GL-CTS/external/openglcts/modules/glesext",
-  "//third_party/VK-GL-CTS/external/openglcts/modules/runner",
-  "//third_party/VK-GL-CTS/framework/referencerenderer",
-  "//third_party/VK-GL-CTS/modules/glshared",
-  "//third_party/VK-GL-CTS/framework/platform/ohos/rosen_context",
+  "//third_party/vk-gl-cts",
+  "//third_party/vk-gl-cts/framework/delibs/debase",
+  "//third_party/vk-gl-cts/framework/delibs/decpp",
+  "//third_party/vk-gl-cts/framework/delibs/depool",
+  "//third_party/vk-gl-cts/framework/delibs/dethread",
+  "//third_party/vk-gl-cts/framework/delibs/deutil",
+  "//third_party/vk-gl-cts/framework/delibs/destream",
+  "//third_party/vk-gl-cts/framework/common",
+  "//third_party/vk-gl-cts/framework/qphelper",
+  "//third_party/vk-gl-cts/framework/xexml",
+  "//third_party/vk-gl-cts/framework/egl",
+  "//third_party/vk-gl-cts/framework/egl/wrapper",
+  "//third_party/vk-gl-cts/framework/opengl",
+  "//third_party/vk-gl-cts/framework/opengl/wrapper",
+  "//third_party/vk-gl-cts/framework/opengl/simplereference",
+  "//third_party/vk-gl-cts/framework/platform/ohos",
+  "//third_party/libpng",
+  "//third_party/vk-gl-cts/external/openglcts/modules",
+  "//third_party/vk-gl-cts/external/openglcts/modules/common",
+  "//third_party/vk-gl-cts/external/openglcts/modules/gl",
+  "//third_party/vk-gl-cts/external/openglcts/modules/gles2",
+  "//third_party/vk-gl-cts/external/openglcts/modules/gles3",
+  "//third_party/vk-gl-cts/external/openglcts/modules/gles31",
+  "//third_party/vk-gl-cts/external/openglcts/modules/gles32",
+  "//third_party/vk-gl-cts/external/openglcts/modules/glesext",
+  "//third_party/vk-gl-cts/external/openglcts/modules/runner",
+  "//third_party/vk-gl-cts/framework/referencerenderer",
+  "//third_party/vk-gl-cts/modules/glshared",
+  "//third_party/vk-gl-cts/framework/platform/ohos/rosen_context",
 ]
 
 common_depends = [
-  "//foundation/graphic/standard:libvsync_client",
-  "//foundation/graphic/standard/rosen/modules/2d_graphics:2d_graphics",
-  "//foundation/graphic/standard/rosen/modules/render_service_base:librender_service_base",
-  "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
-  "//foundation/graphic/standard/rosen/samples/2d_graphics:drawing_sample_rs",
+  "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
+  "//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
+  "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
+  "//foundation/graphic/graphic_2d/rosen/samples/2d_graphics:drawing_sample_rs",
   "//foundation/window/window_manager/wm:libwm",
   "//third_party/zlib:libz",
-  "//third_party/VK-GL-CTS/framework/common:libdeqp_tcutil",
-  "//third_party/VK-GL-CTS/framework/delibs/decpp:libdeqp_decpp",
-  "//third_party/VK-GL-CTS/framework/delibs/debase:libdeqp_debase",
-  "//third_party/VK-GL-CTS/framework/delibs/deutil:libdeqp_deutil",
-  "//third_party/VK-GL-CTS/framework/qphelper:libdeqp_qphelper",
-  "//third_party/VK-GL-CTS/framework/delibs/dethread:libdeqp_dethread",
-  "//third_party/VK-GL-CTS/framework/xexml:libdeqp_xexml",
-  "//third_party/VK-GL-CTS/framework/egl:libdeqp_eglutil",
-  "//third_party/VK-GL-CTS/framework/egl/wrapper:libdeqp_eglwrapper",
-  "//third_party/VK-GL-CTS/framework/opengl:libdeqp_glutil",
-  "//third_party/VK-GL-CTS/framework/opengl/wrapper:libdeqp_glwrapper",
-  "//third_party/VK-GL-CTS/framework/opengl/simplereference:libdeqp_glutil-sglr",
-  "//third_party/VK-GL-CTS/modules/egl:libdeqp-egl",
-  "//third_party/VK-GL-CTS/modules/gles2:libdeqp-gles2",
-  "//third_party/VK-GL-CTS/modules/gles3:libdeqp-gles3",
-  "//third_party/VK-GL-CTS/modules/gles31:libdeqp-gles31",
-  "//third_party/VK-GL-CTS/modules/glshared:libdeqp-gl-shared",
-  "//third_party/VK-GL-CTS/external/openglcts/modules:libdeqp_glcts",
+  "//third_party/vk-gl-cts/framework/common:libdeqp_tcutil",
+  "//third_party/vk-gl-cts/framework/delibs/decpp:libdeqp_decpp",
+  "//third_party/vk-gl-cts/framework/delibs/debase:libdeqp_debase",
+  "//third_party/vk-gl-cts/framework/delibs/deutil:libdeqp_deutil",
+  "//third_party/vk-gl-cts/framework/qphelper:libdeqp_qphelper",
+  "//third_party/vk-gl-cts/framework/delibs/dethread:libdeqp_dethread",
+  "//third_party/vk-gl-cts/framework/xexml:libdeqp_xexml",
+  "//third_party/vk-gl-cts/framework/egl:libdeqp_eglutil",
+  "//third_party/vk-gl-cts/framework/egl/wrapper:libdeqp_eglwrapper",
+  "//third_party/vk-gl-cts/framework/opengl:libdeqp_glutil",
+  "//third_party/vk-gl-cts/framework/opengl/wrapper:libdeqp_glwrapper",
+  "//third_party/vk-gl-cts/framework/opengl/simplereference:libdeqp_glutil-sglr",
+  "//third_party/vk-gl-cts/modules/egl:libdeqp-egl",
+  "//third_party/vk-gl-cts/modules/gles2:libdeqp-gles2",
+  "//third_party/vk-gl-cts/modules/gles3:libdeqp-gles3",
+  "//third_party/vk-gl-cts/modules/gles31:libdeqp-gles31",
+  "//third_party/vk-gl-cts/modules/glshared:libdeqp-gl-shared",
+  "//third_party/vk-gl-cts/external/openglcts/modules:libdeqp_glcts",
 
   "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
-  "//foundation/graphic/standard:libvsync_client",
-  "//foundation/graphic/standard:libwmclient",
-  "//foundation/graphic/standard/rosen/modules/2d_graphics:2d_graphics",
-  "//foundation/graphic/standard/rosen/modules/render_service_base:librender_service_base",
-  "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
+  "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
+  "//foundation/graphic/graphic_2d/rosen/modules/render_service_base:librender_service_base",
+  "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
   "//third_party/zlib:libz",
 
   "//foundation/window/window_manager/dm:libdm",
   "//foundation/window/window_manager/dmserver:libdms",
   "//foundation/window/window_manager/wm:libwm",
   "//foundation/window/window_manager/wmserver:libwms",
-  "//third_party/VK-GL-CTS/framework/platform/ohos/rosen_context:rosen_context",
+  "//third_party/vk-gl-cts/framework/platform/ohos/rosen_context:rosen_context",
 ]
 
 common_src = [
-  "//third_party/VK-GL-CTS/framework/platform/ohos/context/tcuOhosNativeContext.cpp",
-  "//third_party/VK-GL-CTS/framework/platform/ohos/context/tcuOhosEglContextFactory.cpp",
+  "//third_party/vk-gl-cts/framework/platform/ohos/context/tcuOhosNativeContext.cpp",
+  "//third_party/vk-gl-cts/framework/platform/ohos/context/tcuOhosEglContextFactory.cpp",
 
-  "//third_party/VK-GL-CTS/framework/platform/ohos/display/tcuOhosNativeDisplay.cpp",
-  "//third_party/VK-GL-CTS/framework/platform/ohos/display/tcuOhosEglDisplayFactory.cpp",
+  "//third_party/vk-gl-cts/framework/platform/ohos/display/tcuOhosNativeDisplay.cpp",
+  "//third_party/vk-gl-cts/framework/platform/ohos/display/tcuOhosEglDisplayFactory.cpp",
 
-  "//third_party/VK-GL-CTS/framework/platform/ohos/display/window/tcuOhosNativeWindow.cpp",
-  "//third_party/VK-GL-CTS/framework/platform/ohos/display/window/tcuOhosWindowFactory.cpp",
-  "//third_party/VK-GL-CTS/framework/platform/ohos/display/pixmap/tcuOhosNativePixmap.cpp",
-  "//third_party/VK-GL-CTS/framework/platform/ohos/display/pixmap/tcuOhosPixmapFactory.cpp",
+  "//third_party/vk-gl-cts/framework/platform/ohos/display/window/tcuOhosNativeWindow.cpp",
+  "//third_party/vk-gl-cts/framework/platform/ohos/display/window/tcuOhosWindowFactory.cpp",
+  "//third_party/vk-gl-cts/framework/platform/ohos/display/pixmap/tcuOhosNativePixmap.cpp",
+  "//third_party/vk-gl-cts/framework/platform/ohos/display/pixmap/tcuOhosPixmapFactory.cpp",
 
-  "//third_party/VK-GL-CTS/framework/platform/ohos/tcuOhosPlatform.cpp",
+  "//third_party/vk-gl-cts/framework/platform/ohos/tcuOhosPlatform.cpp",
   "logdefine.cpp",
   "../../ActsApp.cpp",
 ]
 
-import("//third_party/VK-GL-CTS/vk_gl_cts.gni")
+import("//third_party/vk-gl-cts/vk_gl_cts.gni")

graphic/vkgl/cpvkgl.sh

+#!/bin/bash
+
+# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+
+mkdir -p  "suites/acts/testcases/vkgldata"
+cp -rf "../../third_party/vk-gl-cts/data" "suites/acts/testcases/vkgldata"
+cp -rf "../../third_party/vk-gl-cts/external/openglcts/data" "suites/acts/testcases/vkgldata"
+tar czvf "vkgldata.tar.gz" -C "suites/acts/testcases/vkgldata" "."
+mv "vkgldata.tar.gz" "suites/acts/testcases/vkgldata"
+cp -rf "common/common/libdeqp_ohos_platform.z.so" "suites/acts/testcases/vkgldata"
+cp -rf "common/common/librosen_context.z.so" "suites/acts/testcases/vkgldata"
+cp -rf "graphic/graphic_standard/libdeqp_spirv.z.so" "suites/acts/testcases/vkgldata"
+cp -rf "graphic/graphic_standard/libdeqp_spvremapper.z.so" "suites/acts/testcases/vkgldata"
\ No newline at end of file

graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20001TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20002TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20003TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20004TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20005TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20006TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20007TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20008TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20009TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20010TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20011TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20012TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20013TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20014TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20015TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20016TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles20017TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles2TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles2/build0001/BUILD.gn

@@ -25,10 +25,10 @@ config("deqp_platform_ohos_config") {
   defines = deqp_common_defines
 
   # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
+  #defines += [
+  #    "DE_PTR_SIZE=4",
+  #    "_XOPEN_SOURCE=600",
+  #  ]
 }
 
 ohos_static_library("libdeqpgles2func0001") {
@@ -42,7 +42,6 @@ ohos_static_library("libdeqpgles2func0001") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0001") {

graphic/vkgl/src/deqpgles2/build0001/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0001->/data/local/tmp/ActsDeqpgles2TestSuite0001",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0002/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0002") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0002") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0002") {

graphic/vkgl/src/deqpgles2/build0002/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0002->/data/local/tmp/ActsDeqpgles2TestSuite0002",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0003/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0003") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0003") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0003") {

graphic/vkgl/src/deqpgles2/build0003/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0003->/data/local/tmp/ActsDeqpgles2TestSuite0003",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0004/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0004") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0004") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0004") {

graphic/vkgl/src/deqpgles2/build0004/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0004->/data/local/tmp/ActsDeqpgles2TestSuite0004",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0005/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0005") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0005") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0005") {

graphic/vkgl/src/deqpgles2/build0005/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0005->/data/local/tmp/ActsDeqpgles2TestSuite0005",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0006/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0006") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0006") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0006") {

graphic/vkgl/src/deqpgles2/build0006/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0006->/data/local/tmp/ActsDeqpgles2TestSuite0006",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0007/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0007") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0007") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0007") {

graphic/vkgl/src/deqpgles2/build0007/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0007->/data/local/tmp/ActsDeqpgles2TestSuite0007",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0008/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0008") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0008") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0008") {

graphic/vkgl/src/deqpgles2/build0008/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0008->/data/local/tmp/ActsDeqpgles2TestSuite0008",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0009/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0009") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0009") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0009") {

graphic/vkgl/src/deqpgles2/build0009/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0009->/data/local/tmp/ActsDeqpgles2TestSuite0009",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0010/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0010") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0010") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0010") {

graphic/vkgl/src/deqpgles2/build0010/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0010->/data/local/tmp/ActsDeqpgles2TestSuite0010",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0011/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0011") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0011") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0011") {

graphic/vkgl/src/deqpgles2/build0011/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0011->/data/local/tmp/ActsDeqpgles2TestSuite0011",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0012/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0012") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0012") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0012") {

graphic/vkgl/src/deqpgles2/build0012/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0012->/data/local/tmp/ActsDeqpgles2TestSuite0012",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0013/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0013") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0013") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0013") {

graphic/vkgl/src/deqpgles2/build0013/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0013->/data/local/tmp/ActsDeqpgles2TestSuite0013",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0014/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0014") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0014") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0014") {

graphic/vkgl/src/deqpgles2/build0014/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0014->/data/local/tmp/ActsDeqpgles2TestSuite0014",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0015/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0015") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0015") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0015") {

graphic/vkgl/src/deqpgles2/build0015/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0015->/data/local/tmp/ActsDeqpgles2TestSuite0015",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0016/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0016") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0016") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0016") {

graphic/vkgl/src/deqpgles2/build0016/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0016->/data/local/tmp/ActsDeqpgles2TestSuite0016",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles2/build0017/BUILD.gn

@@ -23,12 +23,6 @@ config("deqp_platform_ohos_config") {
   ]
 
   defines = deqp_common_defines
-
-  # defines -=["DE_PTR_SIZE=8"]
-  defines += [
-    "DE_PTR_SIZE=4",
-    "_XOPEN_SOURCE=600",
-  ]
 }
 
 ohos_static_library("libdeqpgles2func0017") {
@@ -42,7 +36,6 @@ ohos_static_library("libdeqpgles2func0017") {
     "multimedia_image_framework:image_native",
   ]
   configs = [ ":deqp_platform_ohos_config" ]
-  public_deps = [ "//foundation/ace/ace_engine/build/external_config/flutter/skia:ace_skia_ohos" ]
 }
 
 ohos_moduletest_suite("ActsDeqpgles2TestSuite0017") {

graphic/vkgl/src/deqpgles2/build0017/Test.json

@@ -12,17 +12,23 @@
             "pre-push" : [
             ],
             "post-push" : [
+                "mount -o rw,remount /",
                 "chmod -R 777 /data/local/tmp/*",
                 "mkdir /data/local/tmp/gl_cts",
-                "tar zxvf /data/local/tmp/gl_cts.tar.gz -C /data/local/tmp/gl_cts",
+                "tar zxvf /data/local/tmp/vkgldata.tar.gz -C /data/local/tmp/gl_cts",
                 "cp -r /data/local/tmp/gl_cts/data/gles2 /data/local/tmp",
                 "cp -r /data/local/tmp/gl_cts/data/gles3 /data/local/tmp",
-                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp"
+                "cp -r /data/local/tmp/gl_cts/data/gles31 /data/local/tmp",
+                "cp /data/local/tmp/libdeqp* /system/lib",
+                "cp /data/local/tmp/librosen_context* /system/lib"
             ],
             "push": [
                 "ActsDeqpgles2TestSuite0017->/data/local/tmp/ActsDeqpgles2TestSuite0017",
-                "../../../common/common/librosen_context.z.so->/system/lib",
-                "../../../../../test/xts/acts/graphic/vkgl/data/gl_cts.tar.gz->/data/local/tmp/gl_cts.tar.gz"
+                "vkgldata/libdeqp_ohos_platform.z.so->/data/local/tmp/libdeqp_ohos_platform.z.so",
+                "vkgldata/librosen_context.z.so->/data/local/tmp/librosen_context.z.so",
+                "vkgldata/libdeqp_spirv.z.so->/data/local/tmp/libdeqp_spirv.z.so",
+                "vkgldata/libdeqp_spvremapper.z.so->/data/local/tmp/libdeqp_spvremapper.z.so",
+                "vkgldata/vkgldata.tar.gz->/data/local/tmp/vkgldata.tar.gz"
             ],
             "type": "PushKit"
         },

graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30001TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30002TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30003TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30004TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30005TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30006TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30007TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30008TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30009TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30010TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30011TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30012TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30013TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30014TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30015TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30016TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30017TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30018TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30019TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30020TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30021TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30022TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30023TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30024TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30025TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30026TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30027TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30028TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30029TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30030TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30031TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30032TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30033TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30034TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30035TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30036TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30037TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30038TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30039TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30040TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30041TestSuite::SetUp(void)

graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.cpp

@@ -47,7 +47,7 @@ namespace OHOS {
         printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported);
         printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings);
         printf("Test run totals --- Waved[%d]\n", runResult.numWaived);
-        printf("testmain end --- COST TIME[%lld]\n", (endTime-startTime));
+        cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;;
     }
     // Preset action of the test case
     void ActsDeqpgles30042TestSuite::SetUp(void)