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

improve rust performance #944

Merged
merged 4 commits into from
Jul 19, 2023
Merged

improve rust performance #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c7273c
rust specialize get_u8_at & put_u8_at improve performance
jordy25519 Jun 10, 2023
14f6b62
remove pointless comment
jordy25519 Jun 10, 2023
9440f55
get_bytes_at crate scoped
jordy25519 Jun 10, 2023
e3a2971
fix java style lints
jordy25519 Jun 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 17 additions & 6 deletions sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/LibRsDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,21 @@ static void generateReadBuf(final Appendable writer, final ByteOrder byteOrder)
indent(writer, 1, "}\n\n");

indent(writer, 1, "#[inline]\n");
indent(writer, 1, "fn get_bytes_at<const COUNT: usize>(slice: &[u8], index: usize) -> [u8; COUNT] {\n");
indent(writer, 2, "Self::get_bytes(slice.split_at(index).1.split_at(COUNT).0)\n");
indent(writer, 1, "pub(crate) fn get_bytes_at<const N: usize>(slice: &[u8], index: usize) -> [u8; N] {\n");
indent(writer, 2, "slice[index..index+N].try_into().expect(\"slice with incorrect length\")\n");
indent(writer, 1, "}\n");

final LinkedHashSet<String> uniquePrimitiveTypes
= new LinkedHashSet<>(TYPE_NAME_BY_PRIMITIVE_TYPE_MAP.values());
final String endianness = byteOrder == LITTLE_ENDIAN ? "le" : "be";

uniquePrimitiveTypes.remove("u8");
indent(writer, 0, "\n");
indent(writer, 1, "#[inline]\n");
indent(writer, 1, "pub fn get_u8_at(&self, index: usize) -> u8 {\n");
indent(writer, 2, "self.data[index]\n");
indent(writer, 1, "}\n");

for (final String primitiveType : uniquePrimitiveTypes)
{
// get_<primitive>_at
Expand All @@ -197,7 +204,7 @@ static void generateReadBuf(final Appendable writer, final ByteOrder byteOrder)
indent(writer, 0, "\n");
indent(writer, 1, "#[inline]\n");
indent(writer, 1, "pub fn get_slice_at(&self, index: usize, len: usize) -> &[u8] {\n");
indent(writer, 2, "self.data.split_at(index).1.split_at(len).0\n");
indent(writer, 2, "&self.data[index..index+len]\n");
indent(writer, 1, "}\n\n");

writer.append("}\n");
Expand All @@ -219,16 +226,20 @@ static void generateWriteBuf(final Writer writer, final ByteOrder byteOrder) thr
indent(writer, 1, "#[inline]\n");
indent(writer, 1,
"pub fn put_bytes_at<const COUNT: usize>(&mut self, index: usize, bytes: [u8; COUNT]) -> usize {\n");
indent(writer, 2, "for (i, byte) in bytes.iter().enumerate() {\n");
indent(writer, 3, "self.data[index + i] = *byte;\n");
indent(writer, 2, "}\n");
indent(writer, 2, "self.data[index..index + COUNT].copy_from_slice(&bytes);\n");
indent(writer, 2, "COUNT\n");
indent(writer, 1, "}\n\n");

final LinkedHashSet<String> uniquePrimitiveTypes
= new LinkedHashSet<>(TYPE_NAME_BY_PRIMITIVE_TYPE_MAP.values());
final String endianness = byteOrder == LITTLE_ENDIAN ? "le" : "be";

uniquePrimitiveTypes.remove("u8");
indent(writer, 1, "#[inline]\n");
indent(writer, 1, "pub fn put_u8_at(&mut self, index: usize, value: u8) {\n");
indent(writer, 2, "self.data[index] = value;\n");
indent(writer, 1, "}\n\n");

for (final String primitiveType : uniquePrimitiveTypes)
{
// put_<primitive>_at
Expand Down
15 changes: 15 additions & 0 deletions sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/RustGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,13 @@ private static void generatePrimitiveEncoder(
indent(sb, level + 1, "let offset = self.%s;\n", getBufOffset(typeToken));
indent(sb, level + 1, "let buf = self.get_buf_mut();\n");

if (rustPrimitiveType.equals("u8"))
{
indent(sb, level + 1, "buf.put_bytes_at(offset, value);\n");
indent(sb, level, "}\n\n");
return;
}

for (int i = 0; i < arrayLength; i++)
{
if (i == 0)
Expand Down Expand Up @@ -646,6 +653,14 @@ private static void generatePrimitiveArrayDecoder(
}

indent(sb, level + 1, "let buf = self.get_buf();\n");
if (rustPrimitiveType.equals("u8"))
{
indent(sb, level + 1, "ReadBuf::get_bytes_at(buf.data, self.%s)\n",
getBufOffset(typeToken));
indent(sb, level, "}\n\n");
return;
}

indent(sb, level + 1, "[\n");
for (int i = 0; i < arrayLength; i++)
{
Expand Down