Refine optimizations

Author: VirxEC

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rlbot-flatbuffers-py"
-version = "0.11.5"
+version = "0.11.6"
 edition = "2021"
 description = "A Python module implemented in Rust for serializing and deserializing RLBot's flatbuffers"
 repository = "https://github.com/VirxEC/rlbot_flatbuffers_py"

Cargo.toml

@@ -25,7 +25,7 @@ pub enum PythonBindType {
 
 impl PythonBindType {
     pub const BASE_TYPES: [&'static str; 6] = ["bool", "i32", "u32", "f32", "String", "u8"];
-    pub const FROZEN_TYPES: [&'static str; 17] = [
+    pub const FROZEN_TYPES: [&'static str; 19] = [
         "GoalInfo",
         "GamePacket",
         "PlayerInfo",
@@ -43,7 +43,10 @@ impl PythonBindType {
         "Vector2",
         "ControllableInfo",
         "ControllableTeamInfo",
+        "BoostPad",
+        "PredictionSlice",
     ];
+    pub const SEMI_FROZEN_TYPES: [&'static str; 2] = ["FieldInfo", "BallPrediction"];
     pub const FROZEN_NEEDS_PY: [&'static str; 3] = ["GamePacket", "BallInfo", "CollisionShape"];
     pub const UNIONS: [&'static str; 4] = [
         "PlayerClass",

codegen/main.rs

@@ -54,6 +54,7 @@ pub struct StructBindGenerator {
     is_all_base_types: bool,
     is_frozen: bool,
     frozen_needs_py: bool,
+    is_semi_frozen: bool,
 }
 
 macro_rules! write_str {
@@ -77,7 +78,8 @@ impl StructBindGenerator {
         types: Vec<CustomType>,
     ) -> Option<Self> {
         let is_frozen = PythonBindType::FROZEN_TYPES.contains(&struct_name.as_str());
-        let frozen_needs_py = PythonBindType::FROZEN_NEEDS_PY.contains(&struct_name.as_str());
+        let frozen_needs_py = is_frozen && PythonBindType::FROZEN_NEEDS_PY.contains(&struct_name.as_str());
+        let is_semi_frozen = !is_frozen && PythonBindType::SEMI_FROZEN_TYPES.contains(&struct_name.as_str());
 
         let is_all_base_types = types
             .iter()
@@ -120,6 +122,7 @@ impl StructBindGenerator {
             is_all_base_types,
             is_frozen,
             frozen_needs_py,
+            is_semi_frozen,
         })
     }
 
@@ -726,6 +729,8 @@ impl Generator for StructBindGenerator {
             self,
             if self.is_frozen {
                 "#[pyclass(module = \"rlbot_flatbuffers\", subclass, get_all, frozen)]"
+            } else if self.is_semi_frozen {
+                "#[pyclass(module = \"rlbot_flatbuffers\", subclass, get_all)]"  
             } else if self.types.is_empty() {
                 "#[pyclass(module = \"rlbot_flatbuffers\", subclass, frozen)]"
             } else {

codegen/structs.rs

@@ -35,15 +35,37 @@ def test_gtp():
 
 
 def test_ballpred():
-    print("Testing BallPrediction")
+    print("Testing 10s BallPrediction")
 
     times = []
 
     ballPred = flat.BallPrediction([flat.PredictionSlice(1) for _ in range(120 * 10)])
 
     print(len(ballPred.pack()))
 
-    for _ in range(100_000):
+    for _ in range(40_000):
+        start = time_ns()
+
+        packed = ballPred.pack()
+        flat.BallPrediction.unpack(packed)
+
+        times.append(time_ns() - start)
+
+    print(f"Total time: {sum(times) / 1_000_000_000:.3f}s")
+    avg_time_ns = sum(times) / len(times)
+    print(f"Average time per: {avg_time_ns / 1000:.1f}us")
+    print(f"Minimum time per: {min(times) / 1000:.1f}us")
+
+    print()
+    print("Testing 6s BallPrediction")
+
+    times = []
+
+    ballPred = flat.BallPrediction([flat.PredictionSlice(1) for _ in range(120 * 6)])
+
+    print(len(ballPred.pack()))
+
+    for _ in range(40_000):
         start = time_ns()
 
         packed = ballPred.pack()
@@ -72,6 +94,8 @@ def find_slice_at_time(ball_prediction: flat.BallPrediction, game_time: float):
 
 
 def test_loop():
+    print("Testing access times")
+
     ballPred = flat.BallPrediction([flat.PredictionSlice(1) for _ in range(120 * 6)])
 
     start = time_ns()
@@ -94,6 +118,7 @@ def test_loop():
 
         times.append(time_ns() - start)
 
+    print()
     print(f"Total time: {sum(times) / 1_000_000_000:.3f}s")
     avg_time_ns = sum(times) / len(times)
     print(f"Average time per: {avg_time_ns / 1000:.1f}us")
@@ -107,6 +132,7 @@ def test_loop():
 
         times.append(time_ns() - start)
 
+    print()
     print(f"Total time: {sum(times) / 1_000_000_000:.3f}s")
     avg_time_ns = sum(times) / len(times)
     print(f"Average time per: {avg_time_ns / 1000:.1f}us")
@@ -120,15 +146,16 @@ def test_loop():
 
         times.append(time_ns() - start)
 
+    print()
     print(f"Total time: {sum(times) / 1_000_000_000:.3f}s")
     avg_time_ns = sum(times) / len(times)
     print(f"Average time per: {avg_time_ns / 1000:.1f}us")
     print(f"Minimum time per: {min(times) / 1000:.1f}us")
 
 
 if __name__ == "__main__":
-    test_gtp()
-    print()
+    # test_gtp()
+    # print()
     test_ballpred()
     print()
     test_loop()