panfrost/ci: Split rules by ISA

Panfrost has two compilers, one for Midgard GPUs and one for Bifrost
GPUs. The respective compilers are src/panfrost/midgard and
src/panfrost/bifrost. Changes internal to just one compiler (or
disassembler) cannot affect the other hardware, so there's no need to
run extra jobs in these cases.

Also split out common vs Gallium panfrost so we can do the right thing
for panvk builds in the imminent future.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10924>
This commit is contained in:
Alyssa Rosenzweig
2021-05-21 11:01:02 -04:00
committed by Marge Bot
parent fe9d37b0c6
commit 1595a9421b
2 changed files with 40 additions and 11 deletions

View File

@@ -167,7 +167,32 @@
when: on_success when: on_success
- when: never - when: never
.panfrost-rules: .panfrost-midgard-rules:
stage: arm
rules:
- *ignore_scheduled_pipelines
- changes:
*mesa_core_file_list
when: on_success
- changes:
*gallium_core_file_list
when: on_success
- changes: &panfrost_gallium_file_list
- src/gallium/drivers/panfrost/**/*
- src/gallium/winsys/panfrost/**/*
when: on_success
- changes: &panfrost_common_file_list
- src/panfrost/include/*
- src/panfrost/lib/*
- src/panfrost/shared/*
- src/panfrost/util/*
when: on_success
- changes:
- src/panfrost/midgard/**/*
when: on_success
- when: never
.panfrost-bifrost-rules:
stage: arm stage: arm
rules: rules:
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
@@ -178,9 +203,13 @@
*gallium_core_file_list *gallium_core_file_list
when: on_success when: on_success
- changes: - changes:
- src/gallium/drivers/panfrost/**/* *panfrost_common_file_list
- src/gallium/winsys/panfrost/**/* when: on_success
- src/panfrost/**/* - changes:
*panfrost_gallium_file_list
when: on_success
- changes:
- src/panfrost/bifrost/**/*
when: on_success when: on_success
- when: never - when: never

View File

@@ -1,7 +1,7 @@
panfrost-t720-gles2:arm64: panfrost-t720-gles2:arm64:
extends: extends:
- .lava-test:arm64 - .lava-test:arm64
- .panfrost-rules - .panfrost-midgard-rules
variables: variables:
DEVICE_TYPE: sun50i-h6-pine-h64 DEVICE_TYPE: sun50i-h6-pine-h64
DTB: ${DEVICE_TYPE} DTB: ${DEVICE_TYPE}
@@ -13,7 +13,7 @@ panfrost-t720-gles2:arm64:
panfrost-t760-gles2:armhf: panfrost-t760-gles2:armhf:
extends: extends:
- .lava-test:armhf - .lava-test:armhf
- .panfrost-rules - .panfrost-midgard-rules
variables: variables:
DEVICE_TYPE: rk3288-veyron-jaq DEVICE_TYPE: rk3288-veyron-jaq
DTB: ${DEVICE_TYPE} DTB: ${DEVICE_TYPE}
@@ -27,7 +27,7 @@ panfrost-t760-gles2:armhf:
panfrost-t760-traces:armhf: panfrost-t760-traces:armhf:
extends: extends:
- .lava-piglit-traces:armhf - .lava-piglit-traces:armhf
- .panfrost-rules - .panfrost-midgard-rules
variables: variables:
DEVICE_TYPE: rk3288-veyron-jaq DEVICE_TYPE: rk3288-veyron-jaq
DTB: ${DEVICE_TYPE} DTB: ${DEVICE_TYPE}
@@ -41,7 +41,7 @@ panfrost-t760-traces:armhf:
.lava-rk3399-gru-kevin: .lava-rk3399-gru-kevin:
extends: extends:
- .panfrost-rules - .panfrost-midgard-rules
variables: variables:
DEVICE_TYPE: rk3399-gru-kevin DEVICE_TYPE: rk3399-gru-kevin
DTB: ${DEVICE_TYPE} DTB: ${DEVICE_TYPE}
@@ -85,7 +85,7 @@ panfrost-t860-traces:arm64:
.lava-meson-g12b-a311d-khadas-vim3: .lava-meson-g12b-a311d-khadas-vim3:
extends: extends:
- .panfrost-rules - .panfrost-bifrost-rules
variables: variables:
DEVICE_TYPE: meson-g12b-a311d-khadas-vim3 DEVICE_TYPE: meson-g12b-a311d-khadas-vim3
DTB: ${DEVICE_TYPE} DTB: ${DEVICE_TYPE}
@@ -119,7 +119,7 @@ panfrost-g52-gles31:arm64:
.lava-acer-mt8183-cp311-3h-jacuzzi: .lava-acer-mt8183-cp311-3h-jacuzzi:
extends: extends:
- .panfrost-rules - .panfrost-bifrost-rules
variables: variables:
DEVICE_TYPE: acer-mt8183-cp311-3h-jacuzzi DEVICE_TYPE: acer-mt8183-cp311-3h-jacuzzi
DTB: mt8183-kukui-jacuzzi-juniper-sku16 DTB: mt8183-kukui-jacuzzi-juniper-sku16
@@ -156,7 +156,7 @@ panfrost-g52-gles31:arm64:
.panfrost-t820-gles2:arm64: .panfrost-t820-gles2:arm64:
extends: extends:
- .lava-test:arm64 - .lava-test:arm64
- .panfrost-rules - .panfrost-midgard-rules
variables: variables:
DEVICE_TYPE: meson-gxm-khadas-vim2 DEVICE_TYPE: meson-gxm-khadas-vim2
DTB: ${DEVICE_TYPE} DTB: ${DEVICE_TYPE}