In preparation to having "vk" (Vulkan) along "gl" (OpenGL/ES).
This is so it is clearer which traces belong to which API and also for
the build jobs.
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
variables:
LIBGL_ALWAYS_SOFTWARE: "true"
GALLIUM_DRIVER: "llvmpipe"
- DEVICE_NAME: "vmware-llvmpipe"
+ DEVICE_NAME: "gl-vmware-llvmpipe"
extends: .traces-test
traces:
- path: glmark2/desktop-blur-radius=5:effect=blur:passes=1:separable=true:windows=4.rdc
expectations:
- - device: vmware-llvmpipe
+ - device: gl-vmware-llvmpipe
checksum: 8867f3a41f180626d0d4b7661ff5c0f4
- path: glmark2/jellyfish.rdc
expectations:
- - device: vmware-llvmpipe
+ - device: gl-vmware-llvmpipe
checksum: e0fe979fee129c0ed42a3059d1a4e1c9
- path: glxgears/glxgears.trace
expectations:
- - device: vmware-llvmpipe
+ - device: gl-vmware-llvmpipe
checksum: 02aca9b4b4ad6fd60331df6e4f87f2cd
traces:
- path: glmark2/jellyfish.rdc
expectations:
- - device: intel-0x3185
+ - device: gl-intel-0x3185
checksum: 58359ea4caf6ad44c6b65526881bbd17
- - device: vmware-llvmpipe
+ - device: gl-vmware-llvmpipe
checksum: d82267c25a0decdad7b563c56bb81106
- path: supertuxkart/supertuxkart-antediluvian-abyss.rdc
expectations:
- - device: intel-0x3185
+ - device: gl-intel-0x3185
checksum: ff827f7eb069afd87cc305a422cba939
```
```yaml
my-hardware-traces:
+ extends: .traces-test-gl
variables:
DEVICE_NAME: "myhardware"
- extends: .traces-test
```
2. Update the .gitlab-ci/traces.yml file with expectations for the new device.
Examples:
- python3 dump_traces_images.py --device-name=vmware-llvmpipe mytrace.trace
- python3 dump_traces_images.py --device-name=vmware-llvmpipe --calls=2075,3300 mytrace.trace
+ python3 dump_traces_images.py --device-name=gl-vmware-llvmpipe mytrace.trace
+ python3 dump_traces_images.py --device-name=gl-vmware-llvmpipe --calls=2075,3300 mytrace.trace
### Running the replay scripts locally
}
run_tracie() {
- # Run tests for the .testtrace types, using the "test-device" device name.
- DEVICE_NAME=test-device CI_PROJECT_DIR="$TEST_DIR" \
+ # Run tests for the .testtrace types, using the "gl-test-device" and "vk-test-device" device names.
+ DEVICE_NAME=gl-test-device CI_PROJECT_DIR="$TEST_DIR" \
+ "$TEST_DIR/tracie.sh" "$TEST_DIR/tests/traces.yml" testtrace && \
+ DEVICE_NAME=vk-test-device CI_PROJECT_DIR="$TEST_DIR" \
"$TEST_DIR/tracie.sh" "$TEST_DIR/tests/traces.yml" testtrace
}
echo " - path: trace1/empty.trace" >> "$TEST_DIR/tests/traces.yml"
echo " expectations:" >> "$TEST_DIR/tests/traces.yml"
- echo " - device: test-device" >> "$TEST_DIR/tests/traces.yml"
+ echo " - device: gl-test-device" >> "$TEST_DIR/tests/traces.yml"
echo " checksum: 000000000000000" >> "$TEST_DIR/tests/traces.yml"
# For the tests we only scan for the .testtrace type,
# so the .trace file added below should be ignored.
run_tracie
assert "[ $? = 0 ]"
- assert "[ -f "$TEST_DIR/results/trace1/test/test-device/magenta.testtrace.log" ]"
- assert "[ -f "$TEST_DIR/results/trace2/test/test-device/olive.testtrace.log" ]"
+ assert "[ -f "$TEST_DIR/results/trace1/test/gl-test-device/magenta.testtrace.log" ]"
+ assert "[ -f "$TEST_DIR/results/trace2/test/vk-test-device/olive.testtrace.log" ]"
- assert "[ ! -f "$TEST_DIR/results/trace1/test/test-device/magenta.testtrace-0.png" ]"
- assert "[ ! -f "$TEST_DIR/results/trace2/test/test-device/olive.testtrace-0.png" ]"
+ assert "[ ! -f "$TEST_DIR/results/trace1/test/gl-test-device/magenta.testtrace-0.png" ]"
+ assert "[ ! -f "$TEST_DIR/results/trace2/test/vk-test-device/olive.testtrace-0.png" ]"
ls -lR "$TEST_DIR"
run_tracie
assert "[ $? != 0 ]"
- assert "[ ! -f "$TEST_DIR/results/trace1/test/test-device/magenta.testtrace-0.png" ]"
- assert "[ -f "$TEST_DIR/results/trace2/test/test-device/olive.testtrace-0.png" ]"
+ assert "[ ! -f "$TEST_DIR/results/trace1/test/gl-test-device/magenta.testtrace-0.png" ]"
+ assert "[ -f "$TEST_DIR/results/trace2/test/vk-test-device/olive.testtrace-0.png" ]"
destroy_repo "$repo"
}
(export TRACIE_STORE_IMAGES=1; run_tracie)
assert "[ $? = 0 ]"
- assert "[ -f "$TEST_DIR/results/trace1/test/test-device/magenta.testtrace-0.png" ]"
- assert "[ -f "$TEST_DIR/results/trace2/test/test-device/olive.testtrace-0.png" ]"
+ assert "[ -f "$TEST_DIR/results/trace1/test/gl-test-device/magenta.testtrace-0.png" ]"
+ assert "[ -f "$TEST_DIR/results/trace2/test/vk-test-device/olive.testtrace-0.png" ]"
ls -lR "$TEST_DIR"
traces:
- path: trace1/magenta.testtrace
expectations:
- - device: test-device
+ - device: gl-test-device
checksum: 8e0a801367e1714463475a824dab363b
- path: trace2/olive.testtrace
expectations:
- - device: test-device
+ - device: vk-test-device
checksum: 5efda83854befe0155ff8517a58d5b51