Fix Static Python benchmarks in OSS builds

- Rename opcodes version directories from 3.14 to 3_14 so they can be
  imported as namespace packages in editable installs.
- Use importlib.import_module fallback instead of file-path manipulation.
- Fix benchmark imports to work in both buck (relative) and OSS (absolute).
- Add .pys stubs to package_data for non-editable installs.

Author: Subbarao Garlapati

cinderx/Interpreter/regen-opcodes-314.sh

@@ -4,6 +4,6 @@
 set -e
 
 root=$(sl root)
-buck2 run fbcode//cinderx/PythonLib/opcodes:assign_opcode_numbers314 -- $root/fbcode/cinderx/PythonLib/opcodes/3.14/opcode.py
+buck2 run fbcode//cinderx/PythonLib/opcodes:assign_opcode_numbers314 -- $root/fbcode/cinderx/PythonLib/opcodes/3_14/opcode.py
 
 buck2 run :gen-opcodes-314 -- $root/fbcode/cinderx/Interpreter/3.14/cinder_opcode_ids.h

cinderx/Interpreter/regen-opcodes-315.sh

@@ -4,6 +4,6 @@
 set -e
 
 root=$(sl root)
-buck2 run fbcode//cinderx/PythonLib/opcodes:assign_opcode_numbers314 -- $root/fbcode/cinderx/PythonLib/opcodes/3.14/opcode.py
+buck2 run fbcode//cinderx/PythonLib/opcodes:assign_opcode_numbers314 -- $root/fbcode/cinderx/PythonLib/opcodes/3_14/opcode.py
 
 buck2 run :gen-opcodes-314 -- $root/fbcode/cinderx/Interpreter/3.14/cinder_opcode_ids.h

cinderx/PythonLib/cinderx/compiler/opcodes.py

@@ -33,7 +33,14 @@
         _inline_cache_entries = dict(_inline_cache_entries)
         _specializations = dict(_specializations)
 
-    from cinderx import opcode as cinderx_opcode
+    try:
+        from cinderx import opcode as cinderx_opcode
+    except ImportError:
+        # Editable install: opcode.py hasn't been copied by build_py.
+        import importlib
+
+        _ver_name = f"{sys.version_info.major}_{sys.version_info.minor}"
+        cinderx_opcode = importlib.import_module(f"opcodes.{_ver_name}.opcode")
 
     cinderx_opcode.init(
         STATIC_OPNAMES if sys.version_info >= (3, 14) else opname,

cinderx/PythonLib/opcodes/3.12/opcode.py cinderx/PythonLib/opcodes/3_12/opcode.pycinderx/PythonLib/opcodes/3.12/opcode.py renamed to cinderx/PythonLib/opcodes/3_12/opcode.py

@@ -8,7 +8,10 @@
 
 import cinderx.jit
 
-from .richards_static_lib import Richards
+try:
+    from .richards_static_lib import Richards  # buck
+except ImportError:
+    from richards_static_lib import Richards  # OSS standalone script
 
 
 if __name__ == "__main__":

cinderx/PythonLib/opcodes/3.14/opcode.py cinderx/PythonLib/opcodes/3_14/opcode.pycinderx/PythonLib/opcodes/3.14/opcode.py renamed to cinderx/PythonLib/opcodes/3_14/opcode.py

@@ -8,7 +8,10 @@
 
 import cinderx.jit
 
-from .richards_static_basic_lib import Richards
+try:
+    from .richards_static_basic_lib import Richards  # buck
+except ImportError:
+    from richards_static_basic_lib import Richards  # OSS standalone script
 
 
 if __name__ == "__main__":

cinderx/PythonLib/opcodes/3.15/opcode.py cinderx/PythonLib/opcodes/3_15/opcode.pycinderx/PythonLib/opcodes/3.15/opcode.py renamed to cinderx/PythonLib/opcodes/3_15/opcode.py

@@ -319,12 +319,13 @@ def run(self) -> None:
 
         super().run()
 
-        # Copy opcodes/${PY_VERSION}/opcode.py to cinderx/opcode.py.
+        # Copy opcodes/${PY_VERSION_UNDERSCORED}/opcode.py to cinderx/opcode.py.
         py_version = compute_py_version()
         out_path = self.get_module_outfile(self.build_lib, ["cinderx"], "opcode")
         os.makedirs(os.path.dirname(out_path), exist_ok=True)
+        ver_dir = f"{py_version.replace('.', '_')}"
         self.copy_file(
-            os.path.join(PYTHON_LIB_DIR, f"opcodes/{py_version}/opcode.py"),
+            os.path.join(PYTHON_LIB_DIR, f"opcodes/{ver_dir}/opcode.py"),
             out_path,
             preserve_mode=False,
         )
@@ -488,7 +489,10 @@ def main() -> None:
         },
         packages=find_packages(where=PYTHON_LIB_DIR, exclude=["test_cinderx*"]),
         package_dir={"": PYTHON_LIB_DIR},
-        package_data={"cinderx": [".dev_build"]},
+        package_data={
+            "cinderx": [".dev_build"],
+            "cinderx.compiler.strict": ["stubs/**/*.pys"],
+        },
     )