redscript-mc 1.2.27 → 1.2.28

package/src/optimizer/commands.ts

@@ -20,8 +20,14 @@ export interface CommandFunction {
   commands: IRCommand[]
 }
 
-const SCOREBOARD_READ_RE =
-  /^execute store result score (\$[A-Za-z0-9_]+) rs run scoreboard players get (\S+) (\S+)$/
+// Matches scoreboard reads for LICM/CSE — objective is captured in group 2
+// so the optimizer can reconstruct the command with the same objective.
+let _OBJ_PATTERN = 'rs'
+export function setOptimizerObjective(obj: string): void { _OBJ_PATTERN = obj }
+
+function scoreboardReadRe(): RegExp {
+  return new RegExp(`^execute store result score (\\$[A-Za-z0-9_]+) ${_OBJ_PATTERN} run scoreboard players get (\\S+) (\\S+)$`)
+}
 const SCOREBOARD_WRITE_RE =
   /^(?:scoreboard players (?:set|add|remove|reset)\s+(\S+)\s+(\S+)|scoreboard players operation\s+(\S+)\s+(\S+)\s+[+\-*/%]?= )/
 const EXECUTE_STORE_SCORE_RE =
@@ -130,7 +136,7 @@ function applyLICMInternal(functions: CommandFunction[]): Partial<OptimizationSt
       const scoreboardWrites = new Set<string>()
 
       for (const inner of loopFn.commands) {
-        const readMatch = inner.cmd.match(SCOREBOARD_READ_RE)
+        const readMatch = inner.cmd.match(scoreboardReadRe())
         if (readMatch) {
           const [, temp, player, objective] = readMatch
           const key = `${player} ${objective}`
@@ -147,7 +153,7 @@ function applyLICMInternal(functions: CommandFunction[]): Partial<OptimizationSt
         for (const info of readInfo.values()) {
           const matches = inner.cmd.match(TEMP_RE) ?? []
           const usageCount = matches.filter(name => name === info.temp).length
-          const isDef = inner.cmd.startsWith(`execute store result score ${info.temp} rs run scoreboard players get `)
+          const isDef = inner.cmd.startsWith(`execute store result score ${info.temp} ${_OBJ_PATTERN} run scoreboard players get `)
           if (!isDef) {
             info.uses += usageCount
           }
@@ -172,7 +178,7 @@ function applyLICMInternal(functions: CommandFunction[]): Partial<OptimizationSt
       const rewrittenLoopCommands: IRCommand[] = []
 
       for (const inner of loopFn.commands) {
-        const readMatch = inner.cmd.match(SCOREBOARD_READ_RE)
+        const readMatch = inner.cmd.match(scoreboardReadRe())
         if (readMatch && hoistedTemps.has(readMatch[1])) {
           continue
         }
@@ -182,7 +188,7 @@ function applyLICMInternal(functions: CommandFunction[]): Partial<OptimizationSt
       loopFn.commands = rewrittenLoopCommands
       nextCommands.push(
         ...hoistable.map(item => ({
-          cmd: `execute store result score ${item.temp} rs run scoreboard players get ${item.player} ${item.objective}`,
+          cmd: `execute store result score ${item.temp} ${_OBJ_PATTERN} run scoreboard players get ${item.player} ${item.objective}`,
         })),
         command
       )
@@ -198,9 +204,9 @@ function applyLICMInternal(functions: CommandFunction[]): Partial<OptimizationSt
 
 function extractArithmeticExpression(commands: IRCommand[], index: number): { key: string; dst: string } | null {
   const assign =
-    commands[index]?.cmd.match(/^scoreboard players operation (\$[A-Za-z0-9_]+) rs = (\$[A-Za-z0-9_]+|\$const_-?\d+) rs$/) ??
-    commands[index]?.cmd.match(/^scoreboard players set (\$[A-Za-z0-9_]+) rs (-?\d+)$/)
-  const op = commands[index + 1]?.cmd.match(/^scoreboard players operation (\$[A-Za-z0-9_]+) rs ([+\-*/%]=) (\$[A-Za-z0-9_]+|\$const_-?\d+) rs$/)
+    commands[index]?.cmd.match(new RegExp(`^scoreboard players operation (\\$[A-Za-z0-9_]+) ${_OBJ_PATTERN} = (\\$[A-Za-z0-9_]+|\\$const_-?\\d+) ${_OBJ_PATTERN}$`)) ??
+    commands[index]?.cmd.match(new RegExp(`^scoreboard players set (\\$[A-Za-z0-9_]+) ${_OBJ_PATTERN} (-?\\d+)$`))
+  const op = commands[index + 1]?.cmd.match(new RegExp(`^scoreboard players operation (\\$[A-Za-z0-9_]+) ${_OBJ_PATTERN} ([+\\-*/%]=) (\\$[A-Za-z0-9_]+|\\$const_-?\\d+) ${_OBJ_PATTERN}$`))
   if (!assign || !op || assign[1] !== op[1]) {
     return null
   }
@@ -234,14 +240,14 @@ function applyCSEInternal(functions: CommandFunction[]): Partial<OptimizationSta
 
     for (let i = 0; i < commands.length; i++) {
       const command = commands[i]
-      const readMatch = command.cmd.match(SCOREBOARD_READ_RE)
+      const readMatch = command.cmd.match(scoreboardReadRe())
       if (readMatch) {
         const [, dst, player, objective] = readMatch
         const key = `${player} ${objective}`
         const cached = readCache.get(key)
         if (cached) {
           stats.cseRedundantReads = (stats.cseRedundantReads ?? 0) + 1
-          rewritten.push({ ...command, cmd: `scoreboard players operation ${dst} rs = ${cached} rs` })
+          rewritten.push({ ...command, cmd: `scoreboard players operation ${dst} ${_OBJ_PATTERN} = ${cached} ${_OBJ_PATTERN}` })
         } else {
           readCache.set(key, dst)
           rewritten.push(command)
@@ -255,7 +261,7 @@ function applyCSEInternal(functions: CommandFunction[]): Partial<OptimizationSta
       if (expr) {
         const cached = exprCache.get(expr.key)
         if (cached) {
-          rewritten.push({ ...commands[i], cmd: `scoreboard players operation ${expr.dst} rs = ${cached} rs` })
+          rewritten.push({ ...commands[i], cmd: `scoreboard players operation ${expr.dst} ${_OBJ_PATTERN} = ${cached} ${_OBJ_PATTERN}` })
           stats.cseArithmetic = (stats.cseArithmetic ?? 0) + 1
           i += 1
         } else {

package/src/optimizer/structure.ts

@@ -1,7 +1,11 @@
 import type { IRBlock, IRCommand, IRFunction, IRInstr, Operand, Terminator } from '../ir/types'
-import { createEmptyOptimizationStats, mergeOptimizationStats, optimizeCommandFunctions, type OptimizationStats } from './commands'
+import { createEmptyOptimizationStats, mergeOptimizationStats, optimizeCommandFunctions, setOptimizerObjective, type OptimizationStats } from './commands'
 
-const OBJ = 'rs'
+let OBJ = 'rs'
+export function setStructureObjective(obj: string): void {
+  OBJ = obj
+  setOptimizerObjective(obj)
+}
 const INLINE_THRESHOLD = 8
 
 const BOP_OP: Record<string, string> = {