Skip to content

opteadm/OpteHdl cleanup #735

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.

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

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/buildomat/jobs/p5p.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ source .github/buildomat/common.sh
#
TGT_BASE=${TGT_BASE:=/work}

REL_SRC=target/x86_64-unknown-unknown/release
REL_SRC=target/x86_64-unknown-unknown/release-lto
REL_TGT=$TGT_BASE/release

mkdir -p $REL_TGT
Expand All @@ -43,7 +43,7 @@ cargo --version
rustc --version

header "build xde and opteadm (release+debug)"
ptime -m cargo xtask build
ptime -m cargo xtask build --profile all

#
# Inspect the kernel module for bad relocations in case the old
Expand All @@ -55,7 +55,7 @@ if elfdump $REL_SRC/xde | grep GOTPCREL; then
fi

header "package opte"
cargo xtask package --skip-build
cargo xtask package --skip-build --profile all

banner copy
pfexec mkdir -p /out
Expand Down
10 changes: 5 additions & 5 deletions .github/buildomat/jobs/xde.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ DBG_SRC=target/x86_64-unknown-unknown/debug
DBG_LINK_SRC=target/i686-unknown-illumos/debug
DBG_TGT=$TGT_BASE/debug

REL_SRC=target/x86_64-unknown-unknown/release
REL_SRC=target/x86_64-unknown-unknown/release-lto
REL_LINK_SRC=target/i686-unknown-illumos/release
REL_TGT=$TGT_BASE/release

Expand All @@ -72,13 +72,13 @@ ptime -m cargo clippy -- \
--allow clippy::uninlined-format-args --allow clippy::bad_bit_mask
popd

popd

header "build xde (debug)"
ptime -m ./build-debug.sh
ptime -m cargo xtask build --profile debug xde xde-link

header "build xde (release)"
ptime -m ./build.sh

popd
ptime -m cargo xtask build --profile release xde xde-link

#
# Inspect the kernel module for bad relocations in case the old
Expand Down
179 changes: 4 additions & 175 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ poptrie = { git = "https://github.com/oxidecomputer/poptrie", branch = "multipat

[profile.release]
debug = 2
lto = "thin"

[profile.release-lto]
inherits = "release"
Expand Down
1 change: 0 additions & 1 deletion bench/src/packet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ use opte_test_utils::icmp::RawHardwareAddress;
use opte_test_utils::icmp::gen_icmp_echo;
use opte_test_utils::icmp::gen_icmpv6_echo;
use opte_test_utils::icmp::generate_ndisc;
use opte_test_utils::overlay::BOUNDARY_SERVICES_VNI;
use opte_test_utils::*;

pub type TestCase = (MsgBlk, Direction);
Expand Down
4 changes: 2 additions & 2 deletions bin/opteadm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ repository.workspace = true
# XXX For the time being opteadm needs to set the engine feature to
# get all the types. Once there types are move to their appropriate
# place this feature flag will be replaced/removed.
opte = { workspace = true, features = ["api", "engine", "std"] }
opte = { workspace = true, features = ["api", "std"] }
opte-ioctl.workspace = true
oxide-vpc = { workspace = true, features = ["api", "engine", "std"] }
oxide-vpc = { workspace = true, features = ["api", "std"] }

anyhow.workspace = true
cfg-if.workspace = true
Expand Down
Loading