Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Inet] Prune code for LwIP version 1 #13005

Merged
merged 3 commits into from
Dec 15, 2021
Merged

[Inet] Prune code for LwIP version 1 #13005

merged 3 commits into from
Dec 15, 2021

Conversation

kpschoedel
Copy link
Contributor

Problem

CHIP can't build with LwIP version 1, but there are a number of inherited conditional #if blocks for it.

Change overview

  • Remove conditional code for LwIP version 1
  • Fix conditions that were meant to catch LwIP 2.0 but actually would
    apply to any LwIP x.0

Testing

CI; no change to functionality intended

@kpschoedel
Remove #ifs for LwIP version 1
85a421d 
#### Problem

CHIP can't build with LwIP version 1, but there are a number of
inherited conditional #if blocks for it.

#### Change overview

- Remove conditional code for LwIP version 1
- Fix conditions that were meant to catch LwIP 2.0 but actually would
  apply to any LwIP x.0

#### Testing

CI; no change to functionality intended
@kpschoedel kpschoedel changed the title Prune code for LwIP version 1 [Inet] Prune code for LwIP version 1 Dec 14, 2021
@github-actions
Copy link

github-actions bot commented Dec 14, 2021 •
edited
Loading

PR #13005: Size comparison from c9bc5ae to 4c35be9

Full report (15 builds for efr32, k32w, linux, p6, qpg, telink)
platform target config section c9bc5ae 4c35be9 change % change
efr32 lighting-app BRD4161A (read only) 834360 834360 0 0.0
(read/write) 128632 128632 0 0.0
.bss 126760 126760 0 0.0
.data 1868 1868 0 0.0
.text 834352 834352 0 0.0
BRD4161A+rpc (read only) 821964 821964 0 0.0
(read/write) 145304 145304 0 0.0
.bss 143336 143336 0 0.0
.data 1968 1968 0 0.0
.text 821956 821956 0 0.0
window-app BRD4161A (read only) 811600 811600 0 0.0
(read/write) 127576 127576 0 0.0
.bss 125744 125744 0 0.0
.data 1832 1832 0 0.0
.text 811592 811592 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 688072 688072 0 0.0
.bss 79344 79344 0 0.0
.data 1900 1900 0 0.0
.text 601028 601028 0 0.0
lock-app k32w061+debug (read/write) 638012 638012 0 0.0
.bss 77496 77496 0 0.0
.data 1860 1860 0 0.0
.text 552856 552856 0 0.0
shell k32w061+debug (read/write) 643416 643416 0 0.0
.bss 79804 79804 0 0.0
.data 1840 1840 0 0.0
.text 555972 555972 0 0.0
linux chip-tool-ipv6only arm64 (read only) 6894636 6894636 0 0.0
(read/write) 324033 324033 0 0.0
.bss 56001 56001 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 209248 209248 0 0.0
.dynamic 560 560 0 0.0
.got 53864 53864 0 0.0
.init 24 24 0 0.0
.init_array 176 176 0 0.0
.rodata 366380 366380 0 0.0
.text 5844996 5844996 0 0.0
thermostat-no-ble arm64 (read only) 2003596 2003596 0 0.0
(read/write) 145265 145265 0 0.0
.bss 65633 65633 0 0.0
.data 832 832 0 0.0
.data.rel.ro 72064 72064 0 0.0
.dynamic 560 560 0 0.0
.got 3840 3840 0 0.0
.init 24 24 0 0.0
.init_array 288 288 0 0.0
.rodata 127996 127996 0 0.0
.text 1664112 1664112 0 0.0
p6 all-clusters-app default (read/write) 2388392 2388392 0 0.0
.bss 118532 118532 0 0.0
.data 2536 2536 0 0.0
.heap 912272 912272 0 0.0
.text 1346656 1346656 0 0.0
light-app default (read/write) 2328696 2328696 0 0.0
.bss 107448 107448 0 0.0
.data 2376 2376 0 0.0
.heap 923520 923520 0 0.0
.text 1286960 1286960 0 0.0
lock-app default (read/write) 2304760 2304760 0 0.0
.bss 106328 106328 0 0.0
.data 2336 2336 0 0.0
.heap 924680 924680 0 0.0
.text 1263024 1263024 0 0.0
qpg lighting-app qpg6105+debug (read only) 532772 532772 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88096 88096 0 0.0
.data 996 996 0 0.0
.text 527452 527452 0 0.0
lock-app qpg6105+debug (read only) 507140 507140 0 0.0
(read/write) 146940 146940 0 0.0
.bss 87232 87232 0 0.0
.data 952 952 0 0.0
.text 501820 501820 0 0.0
persistent-storage-app qpg6105+debug (read only) 106448 106448 0 0.0
(read/write) 146938 146938 0 0.0
.bss 36146 36146 0 0.0
.data 288 288 0 0.0
.text 101128 101128 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 832822 832822 0 0.0
bss 88336 88336 0 0.0
noinit 37160 37160 0 0.0
text 580510 580510 0 0.0

bzbarsky-apple
bzbarsky-apple approved these changes Dec 14, 2021
View reviewed changes
Copy link
Contributor

@bzbarsky-apple bzbarsky-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have a static_assert that LWIP_VERSION_MAJOR > 1 somewhere? Or is that just obvious from any attempt to build?

@kpschoedel
Copy link
Contributor Author

kpschoedel commented Dec 14, 2021 •
edited
Loading

Do we have a static_assert that LWIP_VERSION_MAJOR > 1 somewhere? Or is that just obvious from any attempt to build?

Builds with LwIP v1 would (already) fail, but it's true that it wouldn't hurt to provide an explicit message.

@github-actions
Copy link

github-actions bot commented Dec 14, 2021 •
edited
Loading

PR #13005: Size comparison from c9bc5ae to 7e989d3

Increases (10 builds for efr32, nrfconnect, telink)
platform target config section c9bc5ae 7e989d3 change % change
efr32 lighting-app BRD4161A (read only) 834360 834376 16 0.0
.text 834352 834368 16 0.0
window-app BRD4161A (read only) 811600 811616 16 0.0
.text 811592 811608 16 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 text 624508 624512 4 0.0
nrf52840dk_nrf52840+rpc text 599244 599248 4 0.0
nrf5340dk_nrf5340_cpuapp text 554944 554948 4 0.0
lock-app nrf52840dk_nrf52840 text 604148 604152 4 0.0
nrf5340dk_nrf5340_cpuapp text 534680 534684 4 0.0
pump-app nrf52840dk_nrf52840 text 607752 607756 4 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 896507 896523 16 0.0
text 602948 602952 4 0.0
telink lighting-app tlsr9518adk80d text 580510 580512 2 0.0
Full report (30 builds for efr32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section c9bc5ae 7e989d3 change % change
efr32 lighting-app BRD4161A (read only) 834360 834376 16 0.0
(read/write) 128632 128632 0 0.0
.bss 126760 126760 0 0.0
.data 1868 1868 0 0.0
.text 834352 834368 16 0.0
BRD4161A+rpc (read only) 821964 821964 0 0.0
(read/write) 145304 145304 0 0.0
.bss 143336 143336 0 0.0
.data 1968 1968 0 0.0
.text 821956 821956 0 0.0
window-app BRD4161A (read only) 811600 811616 16 0.0
(read/write) 127576 127576 0 0.0
.bss 125744 125744 0 0.0
.data 1832 1832 0 0.0
.text 811592 811608 16 0.0
k32w lighting-app k32w061+se05x+release (read/write) 688072 688072 0 0.0
.bss 79344 79344 0 0.0
.data 1900 1900 0 0.0
.text 601028 601028 0 0.0
lock-app k32w061+debug (read/write) 638012 638012 0 0.0
.bss 77496 77496 0 0.0
.data 1860 1860 0 0.0
.text 552856 552856 0 0.0
shell k32w061+debug (read/write) 643416 643416 0 0.0
.bss 79804 79804 0 0.0
.data 1840 1840 0 0.0
.text 555972 555972 0 0.0
linux chip-tool-ipv6only arm64 (read only) 6894636 6894636 0 0.0
(read/write) 324033 324033 0 0.0
.bss 56001 56001 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 209248 209248 0 0.0
.dynamic 560 560 0 0.0
.got 53864 53864 0 0.0
.init 24 24 0 0.0
.init_array 176 176 0 0.0
.rodata 366380 366380 0 0.0
.text 5844996 5844996 0 0.0
thermostat-no-ble arm64 (read only) 2003596 2003596 0 0.0
(read/write) 145265 145265 0 0.0
.bss 65633 65633 0 0.0
.data 832 832 0 0.0
.data.rel.ro 72064 72064 0 0.0
.dynamic 560 560 0 0.0
.got 3840 3840 0 0.0
.init 24 24 0 0.0
.init_array 288 288 0 0.0
.rodata 127996 127996 0 0.0
.text 1664112 1664112 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2335416 2335416 0 0.0
.bss 190332 190332 0 0.0
.data 5248 5248 0 0.0
.heap 840864 840864 0 0.0
.text 1297992 1297992 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2330952 2330952 0 0.0
.bss 182192 182192 0 0.0
.data 5544 5544 0 0.0
.heap 848712 848712 0 0.0
.text 1293552 1293552 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2304072 2304072 0 0.0
.bss 181232 181232 0 0.0
.data 5528 5528 0 0.0
.heap 849688 849688 0 0.0
.text 1266672 1266672 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1140008 1140008 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.heap 1020320 1020320 0 0.0
.text 103392 103392 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2054328 2054328 0 0.0
.bss 156980 156980 0 0.0
.data 4864 4864 0 0.0
.heap 874600 874600 0 0.0
.text 1016928 1016928 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 923587 923587 0 0.0
bss 119852 119852 0 0.0
rodata 103620 103620 0 0.0
text 624508 624512 4 0.0
nrf52840dk_nrf52840+rpc (read/write) 886627 886627 0 0.0
bss 116200 116200 0 0.0
rodata 94916 94916 0 0.0
text 599244 599248 4 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 849602 849602 0 0.0
bss 121224 121224 0 0.0
rodata 98876 98876 0 0.0
text 554944 554948 4 0.0
lock-app nrf52840dk_nrf52840 (read/write) 898327 898327 0 0.0
bss 119028 119028 0 0.0
rodata 99736 99736 0 0.0
text 604148 604152 4 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 824586 824586 0 0.0
bss 120440 120440 0 0.0
rodata 95028 95028 0 0.0
text 534680 534684 4 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497447 497447 0 0.0
bss 51820 51820 0 0.0
rodata 45852 45852 0 0.0
text 339488 339488 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 903283 903283 0 0.0
bss 118940 118940 0 0.0
rodata 101092 101092 0 0.0
text 607752 607756 4 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 896507 896523 16 0.0
bss 118820 118820 0 0.0
rodata 99228 99228 0 0.0
text 602948 602952 4 0.0
shell nrf52840dk_nrf52840 (read/write) 782767 782767 0 0.0
bss 109624 109624 0 0.0
rodata 74396 74396 0 0.0
text 524232 524232 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 697838 697838 0 0.0
bss 110604 110604 0 0.0
rodata 69040 69040 0 0.0
text 444868 444868 0 0.0
p6 all-clusters-app default (read/write) 2388392 2388392 0 0.0
.bss 118532 118532 0 0.0
.data 2536 2536 0 0.0
.heap 912272 912272 0 0.0
.text 1346656 1346656 0 0.0
light-app default (read/write) 2328696 2328696 0 0.0
.bss 107448 107448 0 0.0
.data 2376 2376 0 0.0
.heap 923520 923520 0 0.0
.text 1286960 1286960 0 0.0
lock-app default (read/write) 2304760 2304760 0 0.0
.bss 106328 106328 0 0.0
.data 2336 2336 0 0.0
.heap 924680 924680 0 0.0
.text 1263024 1263024 0 0.0
qpg lighting-app qpg6105+debug (read only) 532772 532772 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88096 88096 0 0.0
.data 996 996 0 0.0
.text 527452 527452 0 0.0
lock-app qpg6105+debug (read only) 507140 507140 0 0.0
(read/write) 146940 146940 0 0.0
.bss 87232 87232 0 0.0
.data 952 952 0 0.0
.text 501820 501820 0 0.0
persistent-storage-app qpg6105+debug (read only) 106448 106448 0 0.0
(read/write) 146938 146938 0 0.0
.bss 36146 36146 0 0.0
.data 288 288 0 0.0
.text 101128 101128 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 832822 832822 0 0.0
bss 88336 88336 0 0.0
noinit 37160 37160 0 0.0
text 580510 580512 2 0.0

@bzbarsky-apple bzbarsky-apple merged commit 7ae1cc9 into project-chip:master Dec 15, 2021
@kpschoedel kpschoedel deleted the lwip-version branch December 15, 2021 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bzbarsky-apple bzbarsky-apple bzbarsky-apple approved these changes

@andy31415 andy31415 andy31415 approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@balducci-apple balducci-apple Awaiting requested review from balducci-apple

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@carol-apple carol-apple Awaiting requested review from carol-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@hawk248 hawk248 Awaiting requested review from hawk248

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@LuDuda LuDuda Awaiting requested review from LuDuda

@msandstedt msandstedt Awaiting requested review from msandstedt

@pan-apple pan-apple Awaiting requested review from pan-apple

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

Assignees
No one assigned
Labels
inet openthread platform review - approved system
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kpschoedel @andy31415 @bzbarsky-apple