build: bump fbw dev env #8585

tracernz · 2024-03-27T06:12:27Z

Fixes #[issue_no]

Summary of Changes

Bump FBW dev env to the latest with SDK 0.24.

Screenshots (if necessary)

References

Additional context

Discord username (if different from GitHub):

Testing instructions

Check that the aircraft generally functions okay in SU14 (non-beta).

How to download the PR for QA

Every new commit to this PR will cause new A32NX and A380X artifacts to be created, built, and uploaded.

Make sure you are signed in to GitHub
Click on the Checks tab on the PR
On the left side, click on the bottom PR tab
Click on either flybywire-aircraft-a320-neo or flybywire-aircraft-a380-842 download link at the bottom of the page

Gurgel100 · 2024-04-03T14:56:35Z

Please also adjust the Rust version to 1.74 in rust-toolchain.toml

frankkopp · 2024-04-03T15:55:19Z

Please also adjust the Rust version to 1.74 in rust-toolchain.toml

I assume you tested this? A while ago when I updated the dev env this lead to compile issues.

Saschl · 2024-04-03T16:00:50Z

Please also adjust the Rust version to 1.74 in rust-toolchain.toml

I assume you tested this? A while ago when I updated the dev env this lead to compile issues.

I did and everything worked fine 👍 In fact we could even go to 1.77 from what I could see. 1.74 is default on dev-env though. If we go to 1.77 without a new image, that would work but will cause download of rust dependencies on every build.

2hwk · 2024-04-04T07:16:14Z

Note: This PR causes issues with builds running in SU14, do not merge until SU15 release.

tracernz · 2024-04-04T07:41:43Z

Please also adjust the Rust version to 1.74 in rust-toolchain.toml

Bumped to the 1.74.1 patch release.

The dev-env only specifies 1.74 which is a bit loose for production IMO. Which exact release will it have in any given scenario?

-e- Might then wait for https://github.com/flybywiresim/dev-env/pull/16.

Looks like some fixes will also be needed to build with 1.74.

error: returning the result of a `let` binding from a block
   --> fbw-common/src/wasm/systems/systems/src/air_conditioning/acs_controller.rs:746:17
    |
736 | /                 let interpolation = (Self::UPPER_DUCT_TEMP_LIMIT_LOW_KELVIN
737 | |                     - Self::UPPER_DUCT_TEMP_LIMIT_HIGH_KELVIN)
738 | |                     / (Self::UPPER_DUCT_TEMP_TRIGGER_HIGH_CELSIUS
739 | |                         - Self::UPPER_DUCT_TEMP_TRIGGER_LOW_CELSIUS)
...   |
744 | |                         .get::<kelvin>())
745 | |                     + Self::UPPER_DUCT_TEMP_LIMIT_HIGH_KELVIN;
    | |______________________________________________________________- unnecessary `let` binding
746 |                   interpolation
    |                   ^^^^^^^^^^^^^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#let_and_return
    = note: `-D clippy::let-and-return` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::let_and_return)]`
help: return the expression directly
    |
736 ~                 
737 ~                 (Self::UPPER_DUCT_TEMP_LIMIT_LOW_KELVIN
738 +                     - Self::UPPER_DUCT_TEMP_LIMIT_HIGH_KELVIN)
739 +                     / (Self::UPPER_DUCT_TEMP_TRIGGER_HIGH_CELSIUS
740 +                         - Self::UPPER_DUCT_TEMP_TRIGGER_LOW_CELSIUS)
741 +                     * (zone_measured_temperature.get::<kelvin>()
742 +                         - ThermodynamicTemperature::new::<degree_celsius>(
743 +                             Self::UPPER_DUCT_TEMP_TRIGGER_LOW_CELSIUS,
744 +                         )
745 +                         .get::<kelvin>())
746 +                     + Self::UPPER_DUCT_TEMP_LIMIT_HIGH_KELVIN
    |

error: returning the result of a `let` binding from a block
   --> fbw-common/src/wasm/systems/systems/src/air_conditioning/acs_controller.rs:779:17
    |
769 | /                 let interpolation = (Self::LOWER_DUCT_TEMP_LIMIT_LOW_KELVIN
770 | |                     - Self::LOWER_DUCT_TEMP_LIMIT_HIGH_KELVIN)
771 | |                     / (Self::LOWER_DUCT_TEMP_TRIGGER_HIGH_CELSIUS
772 | |                         - Self::LOWER_DUCT_TEMP_TRIGGER_LOW_CELSIUS)
...   |
777 | |                         .get::<kelvin>())
778 | |                     + Self::LOWER_DUCT_TEMP_LIMIT_HIGH_KELVIN;
    | |______________________________________________________________- unnecessary `let` binding
779 |                   interpolation
    |                   ^^^^^^^^^^^^^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#let_and_return
help: return the expression directly
    |
769 ~                 
770 ~                 (Self::LOWER_DUCT_TEMP_LIMIT_LOW_KELVIN
771 +                     - Self::LOWER_DUCT_TEMP_LIMIT_HIGH_KELVIN)
772 +                     / (Self::LOWER_DUCT_TEMP_TRIGGER_HIGH_CELSIUS
773 +                         - Self::LOWER_DUCT_TEMP_TRIGGER_LOW_CELSIUS)
774 +                     * (zone_measured_temperature.get::<kelvin>()
775 +                         - ThermodynamicTemperature::new::<degree_celsius>(
776 +                             Self::LOWER_DUCT_TEMP_TRIGGER_LOW_CELSIUS,
777 +                         )
778 +                         .get::<kelvin>())
779 +                     + Self::LOWER_DUCT_TEMP_LIMIT_HIGH_KELVIN
    |
    
    error: unneeded `return` statement
    --> fbw-common/src/wasm/systems/systems/src/hydraulic/mod.rs:1757:9
     |
1757 |         return delta_vol / self.max_high_press_volume * fluid.bulk_mod();
     |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
     = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#needless_return
     = note: `-D clippy::needless-return` implied by `-D warnings`
     = help: to override `-D warnings` add `#[allow(clippy::needless_return)]`
help: remove `return`
     |
1757 -         return delta_vol / self.max_high_press_volume * fluid.bulk_mod();
1757 +         delta_vol / self.max_high_press_volume * fluid.bulk_mod()
     |

tracernz · 2024-04-04T08:27:40Z

rust-lang/rust#115010 caused the fuel and payload sys to start failing. Seems they never intended this type of lifetime elision.

Saschl · 2024-04-04T09:07:07Z

The dev-env only specifies 1.74 which is a bit loose for production IMO. Which exact release will it have in any given scenario?

What counts is the version in rust-toolchain.toml, it will override whatever is specified as default in the dev-env.

tracernz · 2024-04-04T09:19:14Z

The dev-env only specifies 1.74 which is a bit loose for production IMO. Which exact release will it have in any given scenario?

What counts is the version in rust-toolchain.toml, it will override whatever is specified as default in the dev-env.

Indeed, but better to make them match so a download isn’t required. It takes a while.

alepouna · 2024-05-23T15:17:13Z

SU15 has just been released, RTM?

Saschl · 2024-05-23T18:55:55Z

There’s one sdk update we missed, might want to incorporate that so we only have the change once 👍

Does not work with our llvm installation and seems like the option is a custom addition by asobo

tracernz · 2024-05-26T08:25:04Z

fbw-a32nx/src/wasm/fbw_a320/build.sh

+  -fdata-sections \
+  -fno-stack-protector \
+  -fstack-size-section \
+  -fwritable-strings \


Suggested change

-fwritable-strings \

I don't think this flag is a good idea. It's to allow old code that expected to be able to write to string constants.

tracernz · 2024-05-26T08:25:25Z

fbw-a32nx/src/wasm/fbw_a320/build.sh

@@ -13,7 +13,7 @@ if [ "$1" == "--debug" ]; then
  WASMLD_ARGS=""
  CLANG_ARGS="-g"
 else
-  WASMLD_ARGS="-O2 --lto-O2 --strip-debug"
+  WASMLD_ARGS="-O2 --lto-O2 --strip-debug --gc-sections"


Suggest keeping this one in the common build flags so we strip unused cruft out of all binaries. Unfortunately GH won't let me suggest keeping the deleted line below (165).

Suggested change

WASMLD_ARGS="-O2 --lto-O2 --strip-debug --gc-sections"

WASMLD_ARGS="-O2 --lto-O2 --strip-debug"

tracernz · 2024-05-26T08:26:52Z

CMakeLists.txt

@@ -10,7 +10,7 @@ set(FBW_COMMON ${FBW_ROOT}/fbw-common/src/wasm)
 include("${FBW_COMMON}/cpp-msfs-framework/cmake/TargetDefinition.cmake")

 # compiler refinement
-set(COMPILER_FLAGS "-Wall -Wextra -Wno-unused-function -Wno-unused-command-line-argument -Wno-ignored-attributes -Wno-macro-redefined -target wasm32-unknown-wasi --sysroot \"${MSFS_SDK}/WASM/wasi-sysroot\" -mthread-model single -fno-exceptions -fms-extensions -fvisibility=hidden -ffunction-sections -fdata-sections -fno-stack-protector")
+set(COMPILER_FLAGS "-Wall -Wextra -Wno-unused-function -Wno-unused-command-line-argument -Wno-ignored-attributes -Wno-macro-redefined -target wasm32-unknown-wasi --sysroot \"${MSFS_SDK}/WASM/wasi-sysroot\" -mthread-model single -fno-exceptions -fms-extensions -fvisibility=hidden -ffunction-sections -fwritable-strings -fdata-sections -Werror=return-type -fno-stack-protector -fstack-size-section -mbulk-memory")


I don't think this flag is a good idea. It's to allow old code that expected to be able to write to string constants.

Suggested change

set(COMPILER_FLAGS "-Wall -Wextra -Wno-unused-function -Wno-unused-command-line-argument -Wno-ignored-attributes -Wno-macro-redefined -target wasm32-unknown-wasi --sysroot \"${MSFS_SDK}/WASM/wasi-sysroot\" -mthread-model single -fno-exceptions -fms-extensions -fvisibility=hidden -ffunction-sections -fwritable-strings -fdata-sections -Werror=return-type -fno-stack-protector -fstack-size-section -mbulk-memory")

set(COMPILER_FLAGS "-Wall -Wextra -Wno-unused-function -Wno-unused-command-line-argument -Wno-ignored-attributes -Wno-macro-redefined -target wasm32-unknown-wasi --sysroot \"${MSFS_SDK}/WASM/wasi-sysroot\" -mthread-model single -fno-exceptions -fms-extensions -fvisibility=hidden -ffunction-sections -fdata-sections -Werror=return-type -fno-stack-protector -fstack-size-section -mbulk-memory")

tracernz · 2024-05-26T08:27:28Z

fbw-a380x/src/wasm/fbw_a380/build.sh

@@ -9,7 +9,7 @@ if [ "$1" == "--debug" ]; then
  WASMLD_ARGS=""
  CLANG_ARGS="-g"
 else
-  WASMLD_ARGS="-O2 --lto-O2 --strip-debug"
+  WASMLD_ARGS="-O2 --lto-O2 --strip-debug --gc-sections"


As above, keep common.

Suggested change

WASMLD_ARGS="-O2 --lto-O2 --strip-debug --gc-sections"

WASMLD_ARGS="-O2 --lto-O2 --strip-debug"

tracernz · 2024-05-26T08:27:33Z

fbw-a380x/src/wasm/fbw_a380/build.sh

+  -fdata-sections \
+  -fno-stack-protector \
+  -fstack-size-section \
+  -fwritable-strings \


Suggested change

-fwritable-strings \

tracernz · 2024-05-26T08:28:12Z

fbw-common/src/wasm/cpp-msfs-framework/cmake/TargetDefinition.cmake

@@ -23,7 +23,7 @@ macro(add_wasm_library)
        # we use `cp` to copy the unoptimized wasm file to the output directory
        set(WASM_OPT_FULL_CMD cp ${CMAKE_CURRENT_BINARY_DIR}/${ADD_WASM_LIBRARY_NAME}.wasm ${OUTPUT_DIRECTORY}/)
    else()
-        set(WASM_LD_ARGS -O2 --lto-O2 --strip-debug)
+        set(WASM_LD_ARGS -O2 --lto-O2 --strip-debug --gc-sections)


Suggested change

set(WASM_LD_ARGS -O2 --lto-O2 --strip-debug --gc-sections)

set(WASM_LD_ARGS -O2 --lto-O2 --strip-debug)

tracernz · 2024-05-26T08:28:30Z

fbw-common/src/wasm/cpp-msfs-framework/cmake/TargetDefinition.cmake

@@ -13,7 +13,7 @@ macro(add_wasm_library)
    endforeach()

    # wasm-ld general flags
-    set(CMAKE_WASM_LINKER_FLAGS --no-entry --allow-undefined --export __wasm_call_ctors --export-dynamic --export malloc --export free --export mallinfo --export mchunkit_begin --export mchunkit_next --export get_pages_state --export mark_decommit_pages --export-table --gc-sections -lc++ -lc++abi -L${MSFS_SDK}/WASM/wasi-sysroot/lib/wasm32-wasi -lc ${MSFS_SDK}/WASM/wasi-sysroot/lib/wasm32-wasi/libclang_rt.builtins-wasm32.a)
+    set(CMAKE_WASM_LINKER_FLAGS --no-entry --allow-undefined --export __wasm_call_ctors --export-dynamic --export malloc --export free --export mallinfo --export mchunkit_begin --export mchunkit_next --export get_pages_state --export mark_decommit_pages --export-table -lc++ -lc++abi -L${MSFS_SDK}/WASM/wasi-sysroot/lib/wasm32-wasi -lc ${MSFS_SDK}/WASM/wasi-sysroot/lib/wasm32-wasi/libclang_rt.builtins-wasm32.a)


Suggested change

set(CMAKE_WASM_LINKER_FLAGS --no-entry --allow-undefined --export __wasm_call_ctors --export-dynamic --export malloc --export free --export mallinfo --export mchunkit_begin --export mchunkit_next --export get_pages_state --export mark_decommit_pages --export-table -lc++ -lc++abi -L${MSFS_SDK}/WASM/wasi-sysroot/lib/wasm32-wasi -lc ${MSFS_SDK}/WASM/wasi-sysroot/lib/wasm32-wasi/libclang_rt.builtins-wasm32.a)

set(CMAKE_WASM_LINKER_FLAGS --no-entry --allow-undefined --export __wasm_call_ctors --export-dynamic --export malloc --export free --export mallinfo --export mchunkit_begin --export mchunkit_next --export get_pages_state --export mark_decommit_pages --export-table --gc-sections -lc++ -lc++abi -L${MSFS_SDK}/WASM/wasi-sysroot/lib/wasm32-wasi -lc ${MSFS_SDK}/WASM/wasi-sysroot/lib/wasm32-wasi/libclang_rt.builtins-wasm32.a)

tracernz · 2024-05-26T08:28:51Z

fbw-common/src/wasm/terronnd/build.sh

@@ -8,7 +8,7 @@ OUTPUT="${DIR}/out/terronnd.wasm"
 if [ "$1" == "--debug" ]; then
  CLANG_ARGS="-g"
 else
-  WASMLD_ARGS="--strip-debug"
+  WASMLD_ARGS="--strip-debug --gc-sections"


Keep the common one.

Suggested change

WASMLD_ARGS="--strip-debug --gc-sections"

WASMLD_ARGS="--strip-debug"

tracernz · 2024-05-26T08:28:58Z

fbw-common/src/wasm/terronnd/build.sh

+  -fdata-sections \
+  -fno-stack-protector \
+  -fstack-size-section \
+  -fwritable-strings \


Suggested change

-fwritable-strings \

build: bump fbw dev env

7549e1a

tracernz added the QA Tier 1 label Mar 27, 2024

tracernz added this to the v0.12.0 milestone Mar 27, 2024

github-actions bot added this to 🟡 Code Review: Ready for Review in Quality Assurance Mar 27, 2024

tracernz mentioned this pull request Mar 27, 2024

build: enable mem info for su15 #8586

Merged

2hwk approved these changes Mar 27, 2024

View reviewed changes

Quality Assurance automation moved this from 🟡 Code Review: Ready for Review to 🟣 QA Team Review: Ready to Test Mar 27, 2024

2hwk added QA Ready to Test Do Not Merge labels Mar 27, 2024

2hwk moved this from 🟣 QA Team Review: Ready to Test to ⌛ Awaiting Actions in Quality Assurance Mar 28, 2024

2hwk added Not Ready For Testing Not ready for testing as still being discussed or developed. SU15 and removed QA Ready to Test labels Mar 28, 2024

build: bump rust to 1.74.1 - 2023-12-07

4f4716e

tracernz added 2 commits April 4, 2024 21:20

fix: clippy issues with 1.74

9b5dd6c

fix: invalid elided lifetimes

c635251

build: bump dev-env to include rust 1.74.1

fb36789

Saschl added 3 commits May 23, 2024 23:41

Merge remote-tracking branch 'fbw/master' into mrc-bump-dev-env

caaaa24

update build flags to match sdk config

1c4bb1c

use new image digest

7858061

remove --stack-guard-page

f1f6b56

Does not work with our llvm installation and seems like the option is a custom addition by asobo

tracernz commented May 26, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build: bump fbw dev env #8585

build: bump fbw dev env #8585

tracernz commented Mar 27, 2024

Gurgel100 commented Apr 3, 2024

frankkopp commented Apr 3, 2024

Saschl commented Apr 3, 2024

2hwk commented Apr 4, 2024

tracernz commented Apr 4, 2024 •

edited

tracernz commented Apr 4, 2024

Saschl commented Apr 4, 2024

tracernz commented Apr 4, 2024

alepouna commented May 23, 2024

Saschl commented May 23, 2024

tracernz May 26, 2024

tracernz May 26, 2024

tracernz May 26, 2024

tracernz May 26, 2024

tracernz May 26, 2024

tracernz May 26, 2024

tracernz May 26, 2024

tracernz May 26, 2024

tracernz May 26, 2024

	WASMLD_ARGS="-O2 --lto-O2 --strip-debug --gc-sections"
	WASMLD_ARGS="-O2 --lto-O2 --strip-debug"

	set(WASM_LD_ARGS -O2 --lto-O2 --strip-debug --gc-sections)
	set(WASM_LD_ARGS -O2 --lto-O2 --strip-debug)

	WASMLD_ARGS="--strip-debug --gc-sections"
	WASMLD_ARGS="--strip-debug"

build: bump fbw dev env #8585

Are you sure you want to change the base?

build: bump fbw dev env #8585

Conversation

tracernz commented Mar 27, 2024

Summary of Changes

Screenshots (if necessary)

References

Additional context

Testing instructions

How to download the PR for QA

Gurgel100 commented Apr 3, 2024

frankkopp commented Apr 3, 2024

Saschl commented Apr 3, 2024

2hwk commented Apr 4, 2024

tracernz commented Apr 4, 2024 • edited

tracernz commented Apr 4, 2024

Saschl commented Apr 4, 2024

tracernz commented Apr 4, 2024

alepouna commented May 23, 2024

Saschl commented May 23, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tracernz commented Apr 4, 2024 •

edited