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

[upstream_utils] Upgrade to LLVM 17.0.1 #5482

Merged
merged 2 commits into from
Sep 22, 2023
Merged

[upstream_utils] Upgrade to LLVM 17.0.1 #5482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93544c2
Upgrade to LLVM 17.0.1
calcmogul Jul 30, 2023
96b2c72
Disable broken JSON tests
calcmogul Sep 8, 2023
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
2 changes: 1 addition & 1 deletion ntcore/src/main/native/cpp/net3/WireDecoder3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ std::optional<uint64_t> WireDecoder3::SimpleValueReader::Read64(
std::optional<double> WireDecoder3::SimpleValueReader::ReadDouble(
std::span<const uint8_t>* in) {
if (auto val = Read64(in)) {
return wpi::BitsToDouble(val.value());
return wpi::bit_cast<double>(val.value());
} else {
return std::nullopt;
}
Expand Down
2 changes: 1 addition & 1 deletion ntcore/src/main/native/cpp/net3/WireEncoder3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ static void Write32(wpi::raw_ostream& os, uint32_t val) {

static void WriteDouble(wpi::raw_ostream& os, double val) {
// The highest performance way to do this, albeit non-portable.
uint64_t v = wpi::DoubleToBits(val);
uint64_t v = wpi::bit_cast<uint64_t>(val);
os << std::span<const uint8_t>{{static_cast<uint8_t>((v >> 56) & 0xff),
static_cast<uint8_t>((v >> 48) & 0xff),
static_cast<uint8_t>((v >> 40) & 0xff),
Expand Down
36 changes: 24 additions & 12 deletions simulation/halsim_xrp/src/main/native/cpp/XRP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,8 @@ void XRP::SetupMotorTag(wpi::raw_uv_ostream& buf) {
<< static_cast<uint8_t>(motor.first); // Channel

// Convert the value
wpi::support::endian::write32be(value, wpi::FloatToBits(motor.second));
wpi::support::endian::write32be(value,
wpi::bit_cast<uint32_t>(motor.second));
buf << value[0] << value[1] << value[2] << value[3];
}
}
Expand All @@ -256,7 +257,8 @@ void XRP::SetupServoTag(wpi::raw_uv_ostream& buf) {
<< static_cast<uint8_t>(servo.first); // Channel

// Convert the value
wpi::support::endian::write32be(value, wpi::FloatToBits(servo.second));
wpi::support::endian::write32be(value,
wpi::bit_cast<uint32_t>(servo.second));
buf << value[0] << value[1] << value[2] << value[3];
}
}
Expand All @@ -277,12 +279,18 @@ void XRP::ReadGyroTag(std::span<const uint8_t> packet) {
}

packet = packet.subspan(2); // Skip past the size and tag
float rate_x = wpi::BitsToFloat(wpi::support::endian::read32be(&packet[0]));
float rate_y = wpi::BitsToFloat(wpi::support::endian::read32be(&packet[4]));
float rate_z = wpi::BitsToFloat(wpi::support::endian::read32be(&packet[8]));
float angle_x = wpi::BitsToFloat(wpi::support::endian::read32be(&packet[12]));
float angle_y = wpi::BitsToFloat(wpi::support::endian::read32be(&packet[16]));
float angle_z = wpi::BitsToFloat(wpi::support::endian::read32be(&packet[20]));
float rate_x =
wpi::bit_cast<float>(wpi::support::endian::read32be(&packet[0]));
float rate_y =
wpi::bit_cast<float>(wpi::support::endian::read32be(&packet[4]));
float rate_z =
wpi::bit_cast<float>(wpi::support::endian::read32be(&packet[8]));
float angle_x =
wpi::bit_cast<float>(wpi::support::endian::read32be(&packet[12]));
float angle_y =
wpi::bit_cast<float>(wpi::support::endian::read32be(&packet[16]));
float angle_z =
wpi::bit_cast<float>(wpi::support::endian::read32be(&packet[20]));

// Make the json object
wpi::json gyroJson;
Expand All @@ -302,9 +310,12 @@ void XRP::ReadAccelTag(std::span<const uint8_t> packet) {
}

packet = packet.subspan(2); // Skip past the size and tag
float accel_x = wpi::BitsToFloat(wpi::support::endian::read32be(&packet[0]));
float accel_y = wpi::BitsToFloat(wpi::support::endian::read32be(&packet[4]));
float accel_z = wpi::BitsToFloat(wpi::support::endian::read32be(&packet[8]));
float accel_x =
wpi::bit_cast<float>(wpi::support::endian::read32be(&packet[0]));
float accel_y =
wpi::bit_cast<float>(wpi::support::endian::read32be(&packet[4]));
float accel_z =
wpi::bit_cast<float>(wpi::support::endian::read32be(&packet[8]));

wpi::json accelJson;
accelJson["type"] = "Accel";
Expand Down Expand Up @@ -362,7 +373,8 @@ void XRP::ReadAnalogTag(std::span<const uint8_t> packet) {
uint8_t analogId = packet[2];

packet = packet.subspan(3);
float voltage = wpi::BitsToFloat(wpi::support::endian::read32be(&packet[0]));
float voltage =
wpi::bit_cast<float>(wpi::support::endian::read32be(&packet[0]));

wpi::json analogJson;
analogJson["type"] = "AI";
Expand Down
22 changes: 0 additions & 22 deletions upstream_utils/llvm_patches/0001-Fix-spelling-language-errors.patch
View file
Open in desktop

This file was deleted.

Loading
Loading