Improve type annotations in typed richards

Summary:
It's not enough to get pyre checking enabled for the full benchmark, but it just
makes it a little cleaner.  We do enable pyre-strict for the basic Static Python
benchmark and pyre-unsafe for the untyped benchmark.

Reviewed By: mpage

Differential Revision: D96208577

fbshipit-source-id: 5bcfa1c282b012b053ebaa46069d694834a289d8

Author: alexmalyshev

cinderx/benchmarks/richards.py

@@ -1,5 +1,7 @@
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 
+# pyre-unsafe
+
 """
 based on a Java version:
  Based on original version written in BCPL by Dr Martin Richards
@@ -31,10 +33,8 @@
 
 BUFSIZE = 4
 
-BUFSIZE_RANGE = range(BUFSIZE)
-
 
-class Packet(object):
+class Packet:
     def __init__(self, l, i, k):
         self.link = l
         self.ident = i
@@ -46,20 +46,19 @@ def append_to(self, lst):
         self.link = None
         if lst is None:
             return self
-        else:
-            p = lst
+        p = lst
+        next = p.link
+        while next is not None:
+            p = next
             next = p.link
-            while next is not None:
-                p = next
-                next = p.link
-            p.link = self
-            return lst
+        p.link = self
+        return lst
 
 
 # Task Records
 
 
-class TaskRec(object):
+class TaskRec:
     pass
 
 
@@ -80,12 +79,12 @@ def __init__(self):
         self.device_in = None
 
     def workInAdd(self, p):
-        self.work_in = p.append_to(self.work_in)
-        return self.work_in
+        self.work_in = work_in = p.append_to(self.work_in)
+        return work_in
 
     def deviceInAdd(self, p):
-        self.device_in = p.append_to(self.device_in)
-        return self.device_in
+        self.device_in = device_in = p.append_to(self.device_in)
+        return device_in
 
 
 class WorkerTaskRec(TaskRec):
@@ -97,7 +96,7 @@ def __init__(self):
 # Task
 
 
-class TaskState(object):
+class TaskState:
     def __init__(self):
         self.packet_pending = True
         self.task_waiting = False
@@ -159,7 +158,7 @@ def trace(a):
 TASKTABSIZE = 10
 
 
-class TaskWorkArea(object):
+class TaskWorkArea:
     def __init__(self):
         self.taskTab = [None] * TASKTABSIZE
 
@@ -169,9 +168,6 @@ def __init__(self):
         self.qpktCount = 0
 
 
-taskWorkArea = TaskWorkArea()
-
-
 class Task(TaskState):
     def __init__(self, i, p, w, initialState, r):
         self.link = taskWorkArea.taskList
@@ -245,6 +241,9 @@ def findtcb(self, id):
         return t
 
 
+taskWorkArea = TaskWorkArea()
+
+
 # DeviceTask
 
 
@@ -353,7 +352,7 @@ def fn(self, pkt, r):
         return self.qpkt(pkt)
 
 
-def schedule():
+def schedule() -> None:
     t = taskWorkArea.taskList
     while t is not None:
         if tracing:
@@ -367,8 +366,8 @@ def schedule():
             t = t.runTask()
 
 
-class Richards(object):
-    def run(self, iterations):
+class Richards:
+    def run(self, iterations: int) -> bool:
         for i in range(iterations):
             taskWorkArea.holdCount = 0
             taskWorkArea.qpktCount = 0

cinderx/benchmarks/richards_static_basic_lib.py

@@ -1,4 +1,7 @@
 # Copyright (c) Meta Platforms, Inc. and affiliates.
+
+# pyre-strict
+
 """
 based on a Java version:
  Based on original version written in BCPL by Dr Martin Richards
@@ -16,7 +19,7 @@
 from __static__ import cast
 
 import sys
-from typing import Final, List
+from typing import Final
 
 # Task IDs
 I_IDLE: Final[int] = 1
@@ -34,35 +37,32 @@
 
 BUFSIZE: Final[int] = 4
 
-BUFSIZE_RANGE: List[int] = list(range(BUFSIZE))
-
 
-class Packet(object):
+class Packet:
     def __init__(self, l: Packet | None, i: int, k: int) -> None:
         self.link: Packet | None = l
         self.ident: int = i
         self.kind: int = k
         self.datum: int = 0
-        self.data: List[int] = [0] * BUFSIZE
+        self.data: list[int] = [0] * BUFSIZE
 
     def append_to(self, lst: Packet | None) -> Packet:
         self.link = None
         if lst is None:
             return self
-        else:
-            p = lst
+        p = lst
+        next = p.link
+        while next is not None:
+            p = next
             next = p.link
-            while next is not None:
-                p = next
-                next = p.link
-            p.link = self
-            return lst
+        p.link = self
+        return lst
 
 
 # Task Records
 
 
-class TaskRec(object):
+class TaskRec:
     pass
 
 
@@ -82,13 +82,13 @@ def __init__(self) -> None:
         self.work_in: Packet | None = None
         self.device_in: Packet | None = None
 
-    def workInAdd(self, p: Packet) -> Packet | None:
-        self.work_in = p.append_to(self.work_in)
-        return self.work_in
+    def workInAdd(self, p: Packet) -> Packet:
+        self.work_in = work_in = p.append_to(self.work_in)
+        return work_in
 
-    def deviceInAdd(self, p: Packet) -> Packet | None:
-        self.device_in = p.append_to(self.device_in)
-        return self.device_in
+    def deviceInAdd(self, p: Packet) -> Packet:
+        self.device_in = device_in = p.append_to(self.device_in)
+        return device_in
 
 
 class WorkerTaskRec(TaskRec):
@@ -100,7 +100,7 @@ def __init__(self) -> None:
 # Task
 
 
-class TaskState(object):
+class TaskState:
     def __init__(self) -> None:
         self.packet_pending: bool = True
         self.task_waiting: bool = False
@@ -150,7 +150,7 @@ def isWaitingWithPacket(self) -> bool:
 layout: int = 0
 
 
-def trace(a):
+def trace(a: object) -> None:
     global layout
     layout -= 1
     if layout <= 0:
@@ -162,20 +162,17 @@ def trace(a):
 TASKTABSIZE: Final[int] = 10
 
 
-class TaskWorkArea(object):
+class TaskWorkArea:
     def __init__(self) -> None:
-        # pyre-ignore[8]: Pyre confused on list[Task | None] vs list[None].
-        self.taskTab: List[Task | None] = [None] * TASKTABSIZE
+        none_task = cast(Task | None, None)
+        self.taskTab: list[Task | None] = [none_task] * TASKTABSIZE
 
         self.taskList: Task | None = None
 
         self.holdCount: int = 0
         self.qpktCount: int = 0
 
 
-taskWorkArea: Final[TaskWorkArea] = TaskWorkArea()
-
-
 class Task(TaskState):
     def __init__(
         self, i: int, p: int, w: Packet | None, initialState: TaskState, r: TaskRec
@@ -251,6 +248,9 @@ def findtcb(self, id: int) -> Task:
         return t
 
 
+taskWorkArea: Final[TaskWorkArea] = TaskWorkArea()
+
+
 # DeviceTask
 
 
@@ -379,7 +379,7 @@ def schedule() -> None:
             t = t.runTask()
 
 
-class Richards(object):
+class Richards:
     def run(self, iterations: int) -> bool:
         for i in range(iterations):
             taskWorkArea.holdCount = 0