From 959a7a15af0d6cfd7bbad4cfb78717b718e88adc Mon Sep 17 00:00:00 2001 From: "ondrej@mirtes.cz" Date: Sun, 15 Nov 2026 16:17:42 +0000 Subject: [PATCH 1/2] Count the benchmarks with the cycle collector off like bin/phpstan bin/phpstan calls gc_disable(), so a collection never runs in an analysis. With the collector on, what a benchmark's setup allocated decides whether a collection falls into the counted call: loading one more stub file moved NodeScopeResolverWalkBench::benchProcessStmtNodes@or-chain-32 by +15.7 % and UnionTypeBench::benchDescribeIntersections@members-256 by -18 %, and with zend.enable_gc=0 the same change moved nothing. Amp-Thread-ID: https://ampcode.com/threads/T-01a1dfe2-5bcc-770e-93fb-aeccdc327aa9 --- tally.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tally.php b/tally.php index cb8bba4342e..d6a836c24fb 100644 --- a/tally.php +++ b/tally.php @@ -7,8 +7,10 @@ return Configuration::create() ->withPaths([__DIR__ . '/tests/bench']) - // bin/phpstan restarts PHP with these OPcache settings, the benchmarks run without the restart - ->withIniEntries([...OpcacheSettings::getIniEntries(), 'memory_limit=-1']) + // bin/phpstan restarts PHP with these OPcache settings, the benchmarks run without the restart. + // bin/phpstan also calls gc_disable(): with the cycle collector on, what the setup allocated + // decides whether a collection falls into the counted call, and it never runs in an analysis. + ->withIniEntries([...OpcacheSettings::getIniEntries(), 'memory_limit=-1', 'zend.enable_gc=0']) // The slowest benchmark takes a few seconds natively and about 13 minutes under the simulation. // One stuck in a loop fails in the native run, one that regresses far beyond that fails as not // measured instead of holding up its shard. From 319b0a7f79daa98946879b16c210bd12d049c898 Mon Sep 17 00:00:00 2001 From: "ondrej@mirtes.cz" Date: Sun, 15 Nov 2026 16:45:05 +0000 Subject: [PATCH 2/2] Accept the benchmark numbers with the cycle collector off From https://github.com/phpstan/phpstan-src/actions/runs/43734687272 Amp-Thread-ID: https://ampcode.com/threads/T-01a1dfe2-5bcc-770e-93fb-aeccdc327aa9 --- tests/bench/AcceptsResultBench.php | 12 ++++---- tests/bench/AccessoryArrayListTypeBench.php | 2 +- tests/bench/ArrayTypeBench.php | 4 +-- ...terReflectionSourceLocatorFactoryBench.php | 2 +- tests/bench/ClassReflectionBench.php | 6 ++-- tests/bench/ComposerHelperBench.php | 2 +- tests/bench/ConstantArrayTypeAcceptsBench.php | 4 +-- .../bench/ConstantStringTypeDescribeBench.php | 2 +- tests/bench/EnumTypesBench.php | 4 +-- tests/bench/FileCacheStorageBench.php | 2 +- tests/bench/GenericObjectTypeCheckBench.php | 4 +-- .../HashFunctionsReturnTypeExtensionBench.php | 2 +- .../InitializerExprTypeResolverBench.php | 2 +- tests/bench/IntersectionTypeQueriesBench.php | 4 +-- tests/bench/IsSuperTypeOfResultBench.php | 16 +++++----- .../IsSuperTypeOfResultOperationsBench.php | 8 ++--- tests/bench/LoaderFactoryBench.php | 2 +- tests/bench/MutatingScopeBench.php | 4 +-- tests/bench/MutatingScopeBranchMergeBench.php | 4 +-- tests/bench/MutatingScopeExpressionsBench.php | 6 ++-- tests/bench/NullsafeOperatorHelperBench.php | 2 +- tests/bench/ObjectTypeBench.php | 4 +-- .../OperatorTypeSpecifyingExtensionBench.php | 6 ++-- .../bench/ParametersAcceptorSelectorBench.php | 2 +- tests/bench/PhpMethodReflectionBench.php | 2 +- tests/bench/RuleBench.php | 30 +++++++++---------- tests/bench/TemplateTypeBench.php | 4 +-- tests/bench/TemplateTypeHelperBench.php | 4 +-- tests/bench/TrinaryLogicBench.php | 10 +++---- tests/bench/TypeCombinatorBench.php | 8 ++--- tests/bench/UnionTypeBench.php | 8 ++--- tests/bench/data/bug-4300.php | 6 ++-- tests/bench/data/bug-7214.php | 6 ++-- 33 files changed, 93 insertions(+), 91 deletions(-) diff --git a/tests/bench/AcceptsResultBench.php b/tests/bench/AcceptsResultBench.php index 26310b01302..8c9a8017264 100644 --- a/tests/bench/AcceptsResultBench.php +++ b/tests/bench/AcceptsResultBench.php @@ -52,16 +52,16 @@ public function boot(int $results): void } #[DataProvider(method: 'results')] - #[ExpectedFor(dataSet: 'results-16', instructions: '16.91K', cycles: '53.31K', memory: '1.180KiB')] - #[ExpectedFor(dataSet: 'results-256', instructions: '212.4K', cycles: '362.0K', memory: '24.24KiB')] + #[ExpectedFor(dataSet: 'results-16', instructions: '17.49K', cycles: '53.87K', memory: '1.180KiB')] + #[ExpectedFor(dataSet: 'results-256', instructions: '222.6K', cycles: '356.3K', memory: '24.24KiB')] public function benchMaxMin(int $results): AcceptsResult { return AcceptsResult::maxMin(...$this->results); } #[DataProvider(method: 'results')] - #[ExpectedFor(dataSet: 'results-16', instructions: '18.73K', cycles: '61.35K', memory: '1.547KiB')] - #[ExpectedFor(dataSet: 'results-256', instructions: '227.3K', cycles: '392.4K', memory: '32.30KiB')] + #[ExpectedFor(dataSet: 'results-16', instructions: '19.23K', cycles: '61.64K', memory: '1.547KiB')] + #[ExpectedFor(dataSet: 'results-256', instructions: '236.2K', cycles: '382.8K', memory: '32.30KiB')] public function benchExtremeIdentity(int $results): AcceptsResult { return AcceptsResult::extremeIdentity(...$this->results); @@ -71,8 +71,8 @@ public function benchExtremeIdentity(int $results): AcceptsResult * StringType::accepts() accepts each constant string of the union. */ #[DataProvider(method: 'results')] - #[ExpectedFor(dataSet: 'results-16', instructions: '43.10K', cycles: '113.9K', memory: '1.547KiB')] - #[ExpectedFor(dataSet: 'results-256', instructions: '557.0K', cycles: '736.1K', memory: '32.30KiB')] + #[ExpectedFor(dataSet: 'results-16', instructions: '47.12K', cycles: '121.3K', memory: '1.914KiB')] + #[ExpectedFor(dataSet: 'results-256', instructions: '618.6K', cycles: '789.3K', memory: '40.35KiB')] public function benchStringAcceptsUnion(int $results): AcceptsResult { return $this->string->accepts($this->union, true); diff --git a/tests/bench/AccessoryArrayListTypeBench.php b/tests/bench/AccessoryArrayListTypeBench.php index 3b38ee4f3da..90c10b513e0 100644 --- a/tests/bench/AccessoryArrayListTypeBench.php +++ b/tests/bench/AccessoryArrayListTypeBench.php @@ -39,7 +39,7 @@ public function boot(): void $this->list->accepts($this->array, true); } - #[Expected(instructions: '1.805M', cycles: '1.869M', memory: '472B')] + #[Expected(instructions: '1.858M', cycles: '1.904M', memory: '472B')] public function benchIsSuperTypeOf(): IsSuperTypeOfResult { [$list, $array] = $this->types(); diff --git a/tests/bench/ArrayTypeBench.php b/tests/bench/ArrayTypeBench.php index 1d4e4e00b05..457bab56c19 100644 --- a/tests/bench/ArrayTypeBench.php +++ b/tests/bench/ArrayTypeBench.php @@ -37,7 +37,7 @@ public function boot(): void /** * array may be a list, which takes two comparisons of its key type to find out. */ - #[Expected(instructions: '616.4K', cycles: '654.3K', memory: '376B')] + #[Expected(instructions: '630.3K', cycles: '655.0K', memory: '376B')] public function benchIsList(): TrinaryLogic { $result = TrinaryLogic::createNo(); @@ -52,7 +52,7 @@ public function benchIsList(): TrinaryLogic * The constructor turns a benevolent (int|string) key into mixed, which other key types do not * need to be described for. */ - #[Expected(instructions: '1.699M', cycles: '1.749M', memory: '416B')] + #[Expected(instructions: '1.664M', cycles: '1.697M', memory: '416B')] public function benchConstruct(): Type { $keyType = IntegerRangeType::fromInterval(0, 100); diff --git a/tests/bench/BetterReflectionSourceLocatorFactoryBench.php b/tests/bench/BetterReflectionSourceLocatorFactoryBench.php index 53e5b1b231d..2e0e6fd7ef7 100644 --- a/tests/bench/BetterReflectionSourceLocatorFactoryBench.php +++ b/tests/bench/BetterReflectionSourceLocatorFactoryBench.php @@ -27,7 +27,7 @@ public function boot(): void /** * Every process creates the source locator when it boots, also one that never locates a class. */ - #[Expected(instructions: '2.283K', cycles: '16.32K', memory: '1.328KiB')] + #[Expected(instructions: '2.184K', cycles: '16.01K', memory: '1.328KiB')] public function benchCreate(): SourceLocator { if ($this->factory === null) { diff --git a/tests/bench/ClassReflectionBench.php b/tests/bench/ClassReflectionBench.php index 6125219e06e..372f0174f31 100644 --- a/tests/bench/ClassReflectionBench.php +++ b/tests/bench/ClassReflectionBench.php @@ -71,13 +71,13 @@ public function doubled(array $values): array /** * Asking again for a method answers from the cache filled by the first call. */ - #[Expected(instructions: '2.194K', cycles: '17.03K', memory: '40B')] + #[Expected(instructions: '2.136K', cycles: '17.24K', memory: '40B')] public function benchGetMethodAgain(): ExtendedMethodReflection { return $this->class()->getMethod('doubled', new OutOfClassScope()); } - #[Expected(instructions: '2.515K', cycles: '21.25K', memory: '40B')] + #[Expected(instructions: '2.457K', cycles: '21.44K', memory: '40B')] public function benchGetPropertyAgain(): ExtendedPropertyReflection { // @phpstan-ignore method.deprecated (the method the cache early return is in) @@ -87,7 +87,7 @@ public function benchGetPropertyAgain(): ExtendedPropertyReflection /** * The hottest call on the class, memoized since 2.2.14. */ - #[Expected(instructions: '1.016K', cycles: '8.566K', memory: '0B')] + #[Expected(instructions: '995', cycles: '8.465K', memory: '0B')] public function benchGetName(): string { return $this->class()->getName(); diff --git a/tests/bench/ComposerHelperBench.php b/tests/bench/ComposerHelperBench.php index 542bf061c8c..3cd764f1118 100644 --- a/tests/bench/ComposerHelperBench.php +++ b/tests/bench/ComposerHelperBench.php @@ -32,7 +32,7 @@ public function boot(): void * * @return array|null */ - #[Expected(instructions: '1.174K', cycles: '13.64K', memory: '0B')] + #[Expected(instructions: '1.146K', cycles: '13.57K', memory: '0B')] public function benchGetComposerConfigAgain(): ?array { return ComposerHelper::getComposerConfig($this->root); diff --git a/tests/bench/ConstantArrayTypeAcceptsBench.php b/tests/bench/ConstantArrayTypeAcceptsBench.php index 9172794a1db..26a8bc700bf 100644 --- a/tests/bench/ConstantArrayTypeAcceptsBench.php +++ b/tests/bench/ConstantArrayTypeAcceptsBench.php @@ -53,8 +53,8 @@ public function boot(int $keys): void } #[DataProvider(method: 'keys')] - #[ExpectedFor(dataSet: 'keys-16', instructions: '2.879M', cycles: '4.157M', memory: '18.22KiB')] - #[ExpectedFor(dataSet: 'keys-128', instructions: '22.85M', cycles: '30.77M', memory: '123.5KiB')] + #[ExpectedFor(dataSet: 'keys-16', instructions: '1.933M', cycles: '2.865M', memory: '17.70KiB')] + #[ExpectedFor(dataSet: 'keys-128', instructions: '15.28M', cycles: '20.69M', memory: '123.0KiB')] public function benchAcceptsSharedValueType(int $keys): AcceptsResult { if ($this->accepting === null || $this->accepted === null) { diff --git a/tests/bench/ConstantStringTypeDescribeBench.php b/tests/bench/ConstantStringTypeDescribeBench.php index e950d20203c..1c6f8186ec0 100644 --- a/tests/bench/ConstantStringTypeDescribeBench.php +++ b/tests/bench/ConstantStringTypeDescribeBench.php @@ -36,7 +36,7 @@ public function boot(): void /** * Strings already described, as the members of a union of an enum's values are again and again. */ - #[Expected(instructions: '513.6K', cycles: '726.7K', memory: '0B')] + #[Expected(instructions: '525.1K', cycles: '733.0K', memory: '0B')] public function benchDescribeAgain(): string { $description = ''; diff --git a/tests/bench/EnumTypesBench.php b/tests/bench/EnumTypesBench.php index f7348cc7033..7517cbe1f79 100644 --- a/tests/bench/EnumTypesBench.php +++ b/tests/bench/EnumTypesBench.php @@ -68,7 +68,7 @@ public function benchUnionWithIntersection(): Type /** * @return list */ - #[Expected(instructions: '804.4K', cycles: '1.086M', memory: '40.11KiB')] + #[Expected(instructions: '826.1K', cycles: '1.089M', memory: '40.11KiB')] public function benchUnionTypeGetFiniteTypes(): array { if ($this->union === null) { @@ -83,7 +83,7 @@ public function benchUnionTypeGetFiniteTypes(): array * * @return list */ - #[Expected(instructions: '1.121M', cycles: '1.668M', memory: '72.42KiB')] + #[Expected(instructions: '1.148M', cycles: '1.674M', memory: '72.42KiB')] public function benchIntersectionTypeGetFiniteTypes(): array { if ($this->intersection === null) { diff --git a/tests/bench/FileCacheStorageBench.php b/tests/bench/FileCacheStorageBench.php index 79c3b93dab7..c7bb1089a5b 100644 --- a/tests/bench/FileCacheStorageBench.php +++ b/tests/bench/FileCacheStorageBench.php @@ -54,7 +54,7 @@ public function boot(int $entries): void */ #[DataProvider(method: 'entries')] #[ExpectedFor(dataSet: 'entries-100', instructions: '234.2K', cycles: '550.6K', memory: '17.29KiB')] - #[ExpectedFor(dataSet: 'entries-10000', instructions: '19.15M', cycles: '32.40M', memory: '1.345MiB')] + #[ExpectedFor(dataSet: 'entries-10000', instructions: '18.84M', cycles: '29.57M', memory: '1.345MiB')] public function benchSave(int $entries): void { if ($this->storage === null) { diff --git a/tests/bench/GenericObjectTypeCheckBench.php b/tests/bench/GenericObjectTypeCheckBench.php index 53df03c8909..d6736657836 100644 --- a/tests/bench/GenericObjectTypeCheckBench.php +++ b/tests/bench/GenericObjectTypeCheckBench.php @@ -50,8 +50,8 @@ public function boot(int $keys): void * @return list */ #[DataProvider(method: 'keys')] - #[ExpectedFor(dataSet: 'keys-16', instructions: '46.09K', cycles: '97.47K', memory: '0B')] - #[ExpectedFor(dataSet: 'keys-64', instructions: '174.5K', cycles: '291.4K', memory: '0B')] + #[ExpectedFor(dataSet: 'keys-16', instructions: '47.56K', cycles: '98.08K', memory: '0B')] + #[ExpectedFor(dataSet: 'keys-64', instructions: '180.4K', cycles: '290.0K', memory: '0B')] public function benchCheckTypeWithoutClasses(int $keys): array { if ($this->type === null) { diff --git a/tests/bench/HashFunctionsReturnTypeExtensionBench.php b/tests/bench/HashFunctionsReturnTypeExtensionBench.php index 985d381a0a9..a23141293a7 100644 --- a/tests/bench/HashFunctionsReturnTypeExtensionBench.php +++ b/tests/bench/HashFunctionsReturnTypeExtensionBench.php @@ -18,7 +18,7 @@ final class HashFunctionsReturnTypeExtensionBench * The container creates the extension for every analysis, also of code that calls no hash function. * Since 2.3.0 its constructor takes no PHP version, PHP ignores the argument there. */ - #[Expected(instructions: '1.640K', cycles: '2.210K', memory: '136B')] + #[Expected(instructions: '1.596K', cycles: '1.996K', memory: '136B')] public function benchCreate(): HashFunctionsReturnTypeExtension { // @phpstan-ignore new.noConstructor (2.2.13 to 2.2.17 take the PHP version) diff --git a/tests/bench/InitializerExprTypeResolverBench.php b/tests/bench/InitializerExprTypeResolverBench.php index d1bdb697c03..e52bf70a8bd 100644 --- a/tests/bench/InitializerExprTypeResolverBench.php +++ b/tests/bench/InitializerExprTypeResolverBench.php @@ -69,7 +69,7 @@ public function benchTernary(int $items): Type */ #[DataProvider(method: 'items')] #[ExpectedFor(dataSet: 'items-8', instructions: '234.4K', cycles: '443.2K', memory: '10.89KiB')] - #[ExpectedFor(dataSet: 'items-128', instructions: '11.05M', cycles: '12.69M', memory: '143.9KiB')] + #[ExpectedFor(dataSet: 'items-128', instructions: '11.38M', cycles: '12.99M', memory: '143.9KiB')] public function benchUnpackStringKeys(int $items): Type { if ($this->unpack === null) { diff --git a/tests/bench/IntersectionTypeQueriesBench.php b/tests/bench/IntersectionTypeQueriesBench.php index 5889a798c66..cd781b99361 100644 --- a/tests/bench/IntersectionTypeQueriesBench.php +++ b/tests/bench/IntersectionTypeQueriesBench.php @@ -60,7 +60,7 @@ public function boot(): void $this->string->describe(VerbosityLevel::precise()); } - #[Expected(instructions: '349.9K', cycles: '365.6K', memory: '0B')] + #[Expected(instructions: '363.9K', cycles: '376.6K', memory: '0B')] public function benchIsOffsetAccessible(): TrinaryLogic { if ($this->array === null) { @@ -75,7 +75,7 @@ public function benchIsOffsetAccessible(): TrinaryLogic return $result; } - #[Expected(instructions: '1.180M', cycles: '1.199M', memory: '0B')] + #[Expected(instructions: '1.207M', cycles: '1.222M', memory: '0B')] public function benchDescribe(): string { if ($this->string === null) { diff --git a/tests/bench/IsSuperTypeOfResultBench.php b/tests/bench/IsSuperTypeOfResultBench.php index b1e7011b08b..25b7d636b7b 100644 --- a/tests/bench/IsSuperTypeOfResultBench.php +++ b/tests/bench/IsSuperTypeOfResultBench.php @@ -64,16 +64,16 @@ public function boot(int $results): void } #[DataProvider(method: 'results')] - #[ExpectedFor(dataSet: 'results-16', instructions: '17.77K', cycles: '54.47K', memory: '1.102KiB')] - #[ExpectedFor(dataSet: 'results-256', instructions: '234.9K', cycles: '392.2K', memory: '24.16KiB')] + #[ExpectedFor(dataSet: 'results-16', instructions: '18.40K', cycles: '55.15K', memory: '1.102KiB')] + #[ExpectedFor(dataSet: 'results-256', instructions: '245.2K', cycles: '391.9K', memory: '24.16KiB')] public function benchMaxMin(int $results): IsSuperTypeOfResult { return IsSuperTypeOfResult::maxMin(...$this->results); } #[DataProvider(method: 'results')] - #[ExpectedFor(dataSet: 'results-16', instructions: '19.58K', cycles: '61.75K', memory: '1.469KiB')] - #[ExpectedFor(dataSet: 'results-256', instructions: '249.9K', cycles: '422.3K', memory: '32.22KiB')] + #[ExpectedFor(dataSet: 'results-16', instructions: '20.14K', cycles: '62.16K', memory: '1.469KiB')] + #[ExpectedFor(dataSet: 'results-256', instructions: '259.0K', cycles: '417.9K', memory: '32.22KiB')] public function benchExtremeIdentity(int $results): IsSuperTypeOfResult { return IsSuperTypeOfResult::extremeIdentity(...$this->results); @@ -83,8 +83,8 @@ public function benchExtremeIdentity(int $results): IsSuperTypeOfResult * StringType::isSuperTypeOf() is asked about each constant string of the union. */ #[DataProvider(method: 'results')] - #[ExpectedFor(dataSet: 'results-16', instructions: '41.64K', cycles: '108.7K', memory: '1.469KiB')] - #[ExpectedFor(dataSet: 'results-256', instructions: '548.1K', cycles: '720.9K', memory: '32.22KiB')] + #[ExpectedFor(dataSet: 'results-16', instructions: '45.70K', cycles: '116.1K', memory: '1.836KiB')] + #[ExpectedFor(dataSet: 'results-256', instructions: '609.3K', cycles: '776.2K', memory: '40.27KiB')] public function benchStringIsSuperTypeOfUnion(int $results): IsSuperTypeOfResult { return $this->string->isSuperTypeOf($this->union); @@ -94,8 +94,8 @@ public function benchStringIsSuperTypeOfUnion(int $results): IsSuperTypeOfResult * Each accessory type is asked about each constant string. */ #[DataProvider(method: 'results')] - #[ExpectedFor(dataSet: 'results-16', instructions: '262.0K', cycles: '350.0K', memory: '496B')] - #[ExpectedFor(dataSet: 'results-256', instructions: '4.107M', cycles: '4.341M', memory: '496B')] + #[ExpectedFor(dataSet: 'results-16', instructions: '267.5K', cycles: '342.9K', memory: '496B')] + #[ExpectedFor(dataSet: 'results-256', instructions: '4.198M', cycles: '4.439M', memory: '496B')] public function benchAccessoriesIsSuperTypeOf(int $results): int { return self::accessoriesIsSuperTypeOf(self::accessories(), $this->strings); diff --git a/tests/bench/IsSuperTypeOfResultOperationsBench.php b/tests/bench/IsSuperTypeOfResultOperationsBench.php index a9965c8da3e..c2cd7b6fe3a 100644 --- a/tests/bench/IsSuperTypeOfResultOperationsBench.php +++ b/tests/bench/IsSuperTypeOfResultOperationsBench.php @@ -29,7 +29,7 @@ public function boot(): void $this->no = new IsSuperTypeOfResult(TrinaryLogic::createNo(), []); } - #[Expected(instructions: '3.151M', cycles: '3.208M', memory: '576B')] + #[Expected(instructions: '3.221M', cycles: '3.262M', memory: '576B')] public function benchAnd(): IsSuperTypeOfResult { $result = $this->yes; @@ -40,7 +40,7 @@ public function benchAnd(): IsSuperTypeOfResult return $result; } - #[Expected(instructions: '3.151M', cycles: '3.209M', memory: '576B')] + #[Expected(instructions: '3.221M', cycles: '3.263M', memory: '576B')] public function benchOr(): IsSuperTypeOfResult { $result = $this->no; @@ -51,7 +51,7 @@ public function benchOr(): IsSuperTypeOfResult return $result; } - #[Expected(instructions: '5.538M', cycles: '5.600M', memory: '792B')] + #[Expected(instructions: '5.687M', cycles: '5.732M', memory: '792B')] public function benchMaxMin(): IsSuperTypeOfResult { $result = $this->no; @@ -62,7 +62,7 @@ public function benchMaxMin(): IsSuperTypeOfResult return $result; } - #[Expected(instructions: '1.807M', cycles: '1.851M', memory: '144B')] + #[Expected(instructions: '1.848M', cycles: '1.878M', memory: '144B')] public function benchNegate(): IsSuperTypeOfResult { $result = $this->no; diff --git a/tests/bench/LoaderFactoryBench.php b/tests/bench/LoaderFactoryBench.php index 51483dd9723..0c85a15a7f9 100644 --- a/tests/bench/LoaderFactoryBench.php +++ b/tests/bench/LoaderFactoryBench.php @@ -38,7 +38,7 @@ public function boot(): void * * @return mixed[] */ - #[Expected(instructions: '531.6K', cycles: '1.005M', memory: '37.03KiB')] + #[Expected(instructions: '426.2K', cycles: '772.1K', memory: '22.99KiB')] public function benchLoadConfigAgain(): array { if ($this->loaderFactory === null) { diff --git a/tests/bench/MutatingScopeBench.php b/tests/bench/MutatingScopeBench.php index db5b432cea9..e5439904b52 100644 --- a/tests/bench/MutatingScopeBench.php +++ b/tests/bench/MutatingScopeBench.php @@ -137,7 +137,7 @@ public function benchPushInFunctionCallGetType(): Type /** * A scalar's type is not stored (#4663). */ - #[Expected(instructions: '3.965K', cycles: '23.76K', memory: '176B')] + #[Expected(instructions: '3.818K', cycles: '23.37K', memory: '176B')] public function benchSpecifyScalarType(): MutatingScope { return $this->scope()->specifyExpressionType(new String_('x'), new StringType(), new StringType(), TrinaryLogic::createYes()); @@ -178,7 +178,7 @@ public function benchAssignPropertyFetch(): MutatingScope /** * Finds the expressions on $this by their keys, not by searching them (#4697). */ - #[Expected(instructions: '66.12K', cycles: '169.7K', memory: '16.61KiB')] + #[Expected(instructions: '67.85K', cycles: '171.2K', memory: '16.61KiB')] public function benchRestoreThis(): MutatingScope { $scope = $this->scope(); diff --git a/tests/bench/MutatingScopeBranchMergeBench.php b/tests/bench/MutatingScopeBranchMergeBench.php index 19cddd21899..f106dbbe00b 100644 --- a/tests/bench/MutatingScopeBranchMergeBench.php +++ b/tests/bench/MutatingScopeBranchMergeBench.php @@ -71,10 +71,10 @@ public function boot(string $shape, int $variables): void #[ExpectedFor(dataSet: 'absorbed-targets-16', instructions: '3.036M', cycles: '4.672M', memory: '58.13KiB')] #[ExpectedFor(dataSet: 'differing-unions-4', instructions: '3.576M', cycles: '4.634M', memory: '74.34KiB')] #[ExpectedFor(dataSet: 'differing-unions-16', instructions: '16.78M', cycles: '20.46M', memory: '599.2KiB')] - #[ExpectedFor(dataSet: 'maybe-defined-64', instructions: '747.8K', cycles: '1.081M', memory: '18.58KiB')] + #[ExpectedFor(dataSet: 'maybe-defined-64', instructions: '764.0K', cycles: '1.072M', memory: '18.58KiB')] #[ExpectedFor(dataSet: 'one-sided-64', instructions: '1.405M', cycles: '2.004M', memory: '50.22KiB')] #[ExpectedFor(dataSet: 'shared-holders-16', instructions: '153.0K', cycles: '400.9K', memory: '9.445KiB')] - #[ExpectedFor(dataSet: 'shared-holders-256', instructions: '1.372M', cycles: '2.123M', memory: '121.9KiB')] + #[ExpectedFor(dataSet: 'shared-holders-256', instructions: '1.404M', cycles: '2.122M', memory: '121.9KiB')] public function benchMergeWith(string $shape, int $variables): MutatingScope { if ($this->ours === null || $this->theirs === null) { diff --git a/tests/bench/MutatingScopeExpressionsBench.php b/tests/bench/MutatingScopeExpressionsBench.php index 23c190b4657..eb78d964fe2 100644 --- a/tests/bench/MutatingScopeExpressionsBench.php +++ b/tests/bench/MutatingScopeExpressionsBench.php @@ -39,8 +39,10 @@ use SplQueue; use SplStack; use Tally\Attribute\Before; +use Tally\Attribute\Constant; use Tally\Attribute\DataProvider; use Tally\Attribute\Linear; +use Tally\Attribute\Logarithmic; use Tally\Meter; use Tally\ScratchDirectory; use function count; @@ -100,7 +102,7 @@ public function benchAfterOpenSslAndClearstatcacheCall(int $expressions): Mutati * Removing never from an expression changes nothing and does not need its type. */ #[DataProvider(method: 'expressions')] - #[Linear(size: 'expressions')] + #[Constant(size: 'expressions')] public function benchRemoveNeverFromExpression(int $expressions): MutatingScope { [$scope, $exprs] = $this->meter->exclude(function () use ($expressions): array { @@ -124,7 +126,7 @@ public function benchRemoveNeverFromExpression(int $expressions): MutatingScope * Narrowing $array['key'] also narrows $array to the types that can be accessed by an offset. */ #[DataProvider(method: 'expressions')] - #[Linear(size: 'expressions')] + #[Logarithmic(size: 'expressions')] public function benchSpecifyArrayDimFetch(int $expressions): MutatingScope { [$scope, $exprs] = $this->meter->exclude(function () use ($expressions): array { diff --git a/tests/bench/NullsafeOperatorHelperBench.php b/tests/bench/NullsafeOperatorHelperBench.php index adc42d75d8d..688cb47740d 100644 --- a/tests/bench/NullsafeOperatorHelperBench.php +++ b/tests/bench/NullsafeOperatorHelperBench.php @@ -103,7 +103,7 @@ public function benchGetNullsafeShortcircuitedExprOfEveryLevel(int $depth, bool * Every link above a nullsafe one is rebuilt, a chain without one is returned as it is. */ #[DataProvider(method: 'chains')] - #[ExpectedFor(dataSet: 'innermost-nullsafe-64', instructions: '261.6K', cycles: '383.1K', memory: '9.609KiB')] + #[ExpectedFor(dataSet: 'innermost-nullsafe-64', instructions: '263.0K', cycles: '363.3K', memory: '9.609KiB')] #[ExpectedFor(dataSet: 'without-nullsafe-64', instructions: '173.3K', cycles: '258.8K', memory: '23.87KiB')] public function benchGetNullsafeShortcircuitedExpr(int $depth, bool $nullsafe): Expr { diff --git a/tests/bench/ObjectTypeBench.php b/tests/bench/ObjectTypeBench.php index 1bde3569fe6..b946bbb6c87 100644 --- a/tests/bench/ObjectTypeBench.php +++ b/tests/bench/ObjectTypeBench.php @@ -42,8 +42,8 @@ public function boot(string $className): void * The type was asked for its class before. */ #[DataProvider(method: 'classes')] - #[ExpectedFor(dataSet: 'class', instructions: '741', cycles: '6.371K', memory: '0B')] - #[ExpectedFor(dataSet: 'generic-class', instructions: '741', cycles: '6.361K', memory: '0B')] + #[ExpectedFor(dataSet: 'class', instructions: '720', cycles: '6.450K', memory: '0B')] + #[ExpectedFor(dataSet: 'generic-class', instructions: '720', cycles: '6.460K', memory: '0B')] public function benchGetClassReflection(string $className): ?ClassReflection { if ($this->object === null) { diff --git a/tests/bench/OperatorTypeSpecifyingExtensionBench.php b/tests/bench/OperatorTypeSpecifyingExtensionBench.php index 26e8b6f1303..219d929808b 100644 --- a/tests/bench/OperatorTypeSpecifyingExtensionBench.php +++ b/tests/bench/OperatorTypeSpecifyingExtensionBench.php @@ -73,9 +73,9 @@ public function boot(string $extension, string $operands): void * @param class-string $extension */ #[DataProvider(method: 'extensions')] - #[ExpectedFor(dataSet: 'bcmath-integers', instructions: '309.3K', cycles: '380.8K', memory: '0B')] - #[ExpectedFor(dataSet: 'bcmath-objects', instructions: '651.3K', cycles: '786.5K', memory: '216B')] - #[ExpectedFor(dataSet: 'gmp-integers', instructions: '294.4K', cycles: '365.1K', memory: '0B')] + #[ExpectedFor(dataSet: 'bcmath-integers', instructions: '317.4K', cycles: '383.8K', memory: '0B')] + #[ExpectedFor(dataSet: 'bcmath-objects', instructions: '665.4K', cycles: '781.7K', memory: '216B')] + #[ExpectedFor(dataSet: 'gmp-integers', instructions: '302.1K', cycles: '367.6K', memory: '0B')] #[ExpectedFor(dataSet: 'gmp-objects', instructions: '593.5K', cycles: '718.6K', memory: '216B')] public function benchSpecify(string $extension, string $operands): int { diff --git a/tests/bench/ParametersAcceptorSelectorBench.php b/tests/bench/ParametersAcceptorSelectorBench.php index c8094664af9..e035e5b92f1 100644 --- a/tests/bench/ParametersAcceptorSelectorBench.php +++ b/tests/bench/ParametersAcceptorSelectorBench.php @@ -60,7 +60,7 @@ public function boot(int $items, bool $templateFirst): void * of nested shapes. The search can stop at a template type in the first item. */ #[DataProvider(method: 'returnTypes')] - #[ExpectedFor(dataSet: 'no-template-256', instructions: '543.0K', cycles: '1.047M', memory: '0B')] + #[ExpectedFor(dataSet: 'no-template-256', instructions: '560.9K', cycles: '1.058M', memory: '0B')] #[ExpectedFor(dataSet: 'template-first-16', instructions: '1.876K', cycles: '15.70K', memory: '0B')] #[ExpectedFor(dataSet: 'template-first-256', instructions: '1.876K', cycles: '15.58K', memory: '0B')] public function benchHasAcceptorTemplateOrLateResolvableType(int $items, bool $templateFirst): bool diff --git a/tests/bench/PhpMethodReflectionBench.php b/tests/bench/PhpMethodReflectionBench.php index eb13a8af13a..0d186ba4b79 100644 --- a/tests/bench/PhpMethodReflectionBench.php +++ b/tests/bench/PhpMethodReflectionBench.php @@ -38,7 +38,7 @@ public function doubleValues(): void $this->method->getName(); } - #[Expected(instructions: '700', cycles: '5.670K', memory: '0B')] + #[Expected(instructions: '679', cycles: '5.619K', memory: '0B')] public function benchGetNameAgain(): string { if ($this->method === null) { diff --git a/tests/bench/RuleBench.php b/tests/bench/RuleBench.php index 137dfdcfdba..6f1e641a4ec 100644 --- a/tests/bench/RuleBench.php +++ b/tests/bench/RuleBench.php @@ -124,25 +124,25 @@ public function boot(string $rule, string $code, ?int $phpVersion): void * @param class-string $rule */ #[DataProvider(method: 'rules')] - #[ExpectedFor(dataSet: 'call-private-method-through-static-final-class', instructions: '59.05K', cycles: '62.60K', memory: '0B')] + #[ExpectedFor(dataSet: 'call-private-method-through-static-final-class', instructions: '60.57K', cycles: '64.03K', memory: '0B')] #[ExpectedFor(dataSet: 'call-to-function-parameters-resolvable-types', instructions: '117.0M', cycles: '141.7M', memory: '13.45KiB')] - #[ExpectedFor(dataSet: 'call-to-method-statement-with-no-discard-dynamic-name', instructions: '20.65K', cycles: '22.46K', memory: '0B')] - #[ExpectedFor(dataSet: 'call-to-static-method-statement-with-no-discard-dynamic-name', instructions: '20.80K', cycles: '22.27K', memory: '0B')] - #[ExpectedFor(dataSet: 'dump-native-type-no-arguments', instructions: '21.29K', cycles: '22.59K', memory: '0B')] - #[ExpectedFor(dataSet: 'dump-phpdoc-type-no-arguments', instructions: '21.29K', cycles: '22.58K', memory: '0B')] - #[ExpectedFor(dataSet: 'dump-type-no-arguments', instructions: '21.29K', cycles: '22.66K', memory: '0B')] - #[ExpectedFor(dataSet: 'duplicate-class-declaration', instructions: '116.1K', cycles: '126.1K', memory: '0B')] - #[ExpectedFor(dataSet: 'duplicate-function-declaration', instructions: '163.1K', cycles: '174.8K', memory: '0B')] - #[ExpectedFor(dataSet: 'file-assert-one-argument', instructions: '21.25K', cycles: '22.65K', memory: '0B')] - #[ExpectedFor(dataSet: 'final-private-method-constructors', instructions: '138.2K', cycles: '146.6K', memory: '0B')] - #[ExpectedFor(dataSet: 'function-conditional-return-type-without-conditional-types', instructions: '143.7K', cycles: '153.7K', memory: '376B')] + #[ExpectedFor(dataSet: 'call-to-method-statement-with-no-discard-dynamic-name', instructions: '21.28K', cycles: '22.75K', memory: '0B')] + #[ExpectedFor(dataSet: 'call-to-static-method-statement-with-no-discard-dynamic-name', instructions: '21.42K', cycles: '22.90K', memory: '0B')] + #[ExpectedFor(dataSet: 'dump-native-type-no-arguments', instructions: '21.93K', cycles: '23.13K', memory: '0B')] + #[ExpectedFor(dataSet: 'dump-phpdoc-type-no-arguments', instructions: '21.93K', cycles: '23.19K', memory: '0B')] + #[ExpectedFor(dataSet: 'dump-type-no-arguments', instructions: '21.93K', cycles: '23.22K', memory: '0B')] + #[ExpectedFor(dataSet: 'duplicate-class-declaration', instructions: '119.6K', cycles: '129.8K', memory: '0B')] + #[ExpectedFor(dataSet: 'duplicate-function-declaration', instructions: '166.8K', cycles: '178.5K', memory: '0B')] + #[ExpectedFor(dataSet: 'file-assert-one-argument', instructions: '21.88K', cycles: '23.14K', memory: '0B')] + #[ExpectedFor(dataSet: 'final-private-method-constructors', instructions: '141.7K', cycles: '150.3K', memory: '0B')] + #[ExpectedFor(dataSet: 'function-conditional-return-type-without-conditional-types', instructions: '148.3K', cycles: '159.0K', memory: '376B')] #[ExpectedFor(dataSet: 'impossible-check-type-function-call', instructions: '6.250M', cycles: '8.182M', memory: '5.758KiB')] - #[ExpectedFor(dataSet: 'instantiation-restricted-constructor', instructions: '3.525M', cycles: '4.949M', memory: '6.531KiB')] + #[ExpectedFor(dataSet: 'instantiation-restricted-constructor', instructions: '3.628M', cycles: '5.050M', memory: '6.742KiB')] #[ExpectedFor(dataSet: 'node-connecting-visitor-attributes-no-arguments', instructions: '38.75K', cycles: '40.87K', memory: '40B')] - #[ExpectedFor(dataSet: 'old-php-parser4-class-outside-class', instructions: '20.21K', cycles: '21.31K', memory: '0B')] + #[ExpectedFor(dataSet: 'old-php-parser4-class-outside-class', instructions: '20.96K', cycles: '22.23K', memory: '0B')] #[ExpectedFor(dataSet: 'parameter-castable-to-string-diff-assoc', instructions: '6.028M', cycles: '6.950M', memory: '3.172KiB')] - #[ExpectedFor(dataSet: 'restricted-function-usage', instructions: '282.2K', cycles: '347.2K', memory: '848B')] - #[ExpectedFor(dataSet: 'restricted-method-usage', instructions: '376.2K', cycles: '477.7K', memory: '256B')] + #[ExpectedFor(dataSet: 'restricted-function-usage', instructions: '287.9K', cycles: '355.2K', memory: '848B')] + #[ExpectedFor(dataSet: 'restricted-method-usage', instructions: '384.3K', cycles: '487.7K', memory: '256B')] public function benchProcessNode(string $rule, string $code, ?int $phpVersion): int { if ($this->rule === null) { diff --git a/tests/bench/TemplateTypeBench.php b/tests/bench/TemplateTypeBench.php index a384f23c94a..756a931a89e 100644 --- a/tests/bench/TemplateTypeBench.php +++ b/tests/bench/TemplateTypeBench.php @@ -109,8 +109,8 @@ private static function withDefaults(int $members): array * None of the strings is an int, so T is not inferred from any of them. */ #[DataProvider(method: 'members')] - #[ExpectedFor(dataSet: 'members-16', instructions: '72.31K', cycles: '173.6K', memory: '1.469KiB')] - #[ExpectedFor(dataSet: 'members-256', instructions: '930.9K', cycles: '1.141M', memory: '32.22KiB')] + #[ExpectedFor(dataSet: 'members-16', instructions: '77.20K', cycles: '183.0K', memory: '1.836KiB')] + #[ExpectedFor(dataSet: 'members-256', instructions: '1.003M', cycles: '1.209M', memory: '40.27KiB')] public function benchInferTemplateTypesFromUnion(int $members): TemplateTypeMap { if ($this->template === null || $this->strings === null) { diff --git a/tests/bench/TemplateTypeHelperBench.php b/tests/bench/TemplateTypeHelperBench.php index d88a70188c5..a63aa114751 100644 --- a/tests/bench/TemplateTypeHelperBench.php +++ b/tests/bench/TemplateTypeHelperBench.php @@ -47,8 +47,8 @@ public function boot(int $keys): void * An array shape without template types, such as the return type of most functions. */ #[DataProvider(method: 'keys')] - #[ExpectedFor(dataSet: 'keys-16', instructions: '8.998K', cycles: '40.68K', memory: '0B')] - #[ExpectedFor(dataSet: 'keys-256', instructions: '95.16K', cycles: '205.0K', memory: '0B')] + #[ExpectedFor(dataSet: 'keys-16', instructions: '9.296K', cycles: '41.29K', memory: '0B')] + #[ExpectedFor(dataSet: 'keys-256', instructions: '99.54K', cycles: '204.9K', memory: '0B')] public function benchResolveTemplateTypes(int $keys): Type { if ($this->shape === null) { diff --git a/tests/bench/TrinaryLogicBench.php b/tests/bench/TrinaryLogicBench.php index 72a45b6f6c4..0c561590c99 100644 --- a/tests/bench/TrinaryLogicBench.php +++ b/tests/bench/TrinaryLogicBench.php @@ -62,7 +62,7 @@ public function boot(int $count): void #[DataProvider(method: 'operands')] #[ExpectedFor(dataSet: 'operands-1', instructions: '1.111M', cycles: '1.135M', memory: '0B')] - #[ExpectedFor(dataSet: 'operands-4', instructions: '2.356M', cycles: '2.387M', memory: '216B')] + #[ExpectedFor(dataSet: 'operands-4', instructions: '2.427M', cycles: '2.450M', memory: '216B')] public function benchAnd(int $operands): TrinaryLogic { $result = TrinaryLogic::createYes(); @@ -76,7 +76,7 @@ public function benchAnd(int $operands): TrinaryLogic #[DataProvider(method: 'operands')] #[ExpectedFor(dataSet: 'operands-1', instructions: '1.111M', cycles: '1.136M', memory: '0B')] - #[ExpectedFor(dataSet: 'operands-4', instructions: '2.356M', cycles: '2.388M', memory: '216B')] + #[ExpectedFor(dataSet: 'operands-4', instructions: '2.427M', cycles: '2.451M', memory: '216B')] public function benchOr(int $operands): TrinaryLogic { $result = TrinaryLogic::createNo(); @@ -89,7 +89,7 @@ public function benchOr(int $operands): TrinaryLogic } #[DataProvider(method: 'fourOperands')] - #[ExpectedFor(dataSet: 'operands-4', instructions: '2.739M', cycles: '2.771M', memory: '216B')] + #[ExpectedFor(dataSet: 'operands-4', instructions: '2.814M', cycles: '2.839M', memory: '216B')] public function benchMaxMin(int $operands): TrinaryLogic { $result = TrinaryLogic::createNo(); @@ -105,7 +105,7 @@ public function benchMaxMin(int $operands): TrinaryLogic * The lazy methods stop at the first no or yes, so every callback answers maybe. */ #[DataProvider(method: 'objects')] - #[ExpectedFor(dataSet: 'objects-8', instructions: '11.62M', cycles: '11.92M', memory: '832B')] + #[ExpectedFor(dataSet: 'objects-8', instructions: '11.87M', cycles: '12.16M', memory: '832B')] public function benchLazyAnd(int $objects): TrinaryLogic { $result = TrinaryLogic::createYes(); @@ -120,7 +120,7 @@ public function benchLazyAnd(int $objects): TrinaryLogic * The lazy methods stop at the first no or yes, so every callback answers maybe. */ #[DataProvider(method: 'objects')] - #[ExpectedFor(dataSet: 'objects-8', instructions: '11.62M', cycles: '11.98M', memory: '832B')] + #[ExpectedFor(dataSet: 'objects-8', instructions: '11.87M', cycles: '12.22M', memory: '832B')] public function benchLazyOr(int $objects): TrinaryLogic { $result = TrinaryLogic::createNo(); diff --git a/tests/bench/TypeCombinatorBench.php b/tests/bench/TypeCombinatorBench.php index 8868e6c2593..8a0e5f9eb2b 100644 --- a/tests/bench/TypeCombinatorBench.php +++ b/tests/bench/TypeCombinatorBench.php @@ -28,7 +28,7 @@ use Tally\Attribute\DataProvider; use Tally\Attribute\ExpectedFor; use Tally\Attribute\Linear; -use Tally\Attribute\Polynomial; +use Tally\Attribute\Linearithmic; use Tally\ScratchDirectory; final class TypeCombinatorBench @@ -145,7 +145,7 @@ public function benchUnionConstantIntegers(int $types): Type * only in their values. */ #[DataProvider(method: 'types')] - #[Polynomial(size: 'types', degree: 2)] + #[Linearithmic(size: 'types')] public function benchUnionConstantArrays(int $types): Type { return TypeCombinator::union(...$this->arrays); @@ -192,7 +192,7 @@ public function benchIntersectBenevolentUnion(int $types): Type #[DataProvider(method: 'types')] #[ExpectedFor(dataSet: 'types-16', instructions: '436.3K', cycles: '627.1K', memory: '3.430KiB')] #[ExpectedFor(dataSet: 'types-64', instructions: '473.0K', cycles: '682.2K', memory: '8.453KiB')] - #[ExpectedFor(dataSet: 'types-256', instructions: '1.723M', cycles: '2.065M', memory: '38.72KiB')] + #[ExpectedFor(dataSet: 'types-256', instructions: '1.759M', cycles: '2.081M', memory: '38.72KiB')] public function benchUnionGeneralScalars(int $types): Type { return TypeCombinator::union(...$this->generalScalars); @@ -228,7 +228,7 @@ public function benchUnionGeneralArrayAndConstantArrays(int $types): Type */ #[DataProvider(method: 'types')] #[ExpectedFor(dataSet: 'types-16', instructions: '3.245M', cycles: '4.253M', memory: '214.9KiB')] - #[ExpectedFor(dataSet: 'types-64', instructions: '100.9M', cycles: '127.5M', memory: '902.8KiB')] + #[ExpectedFor(dataSet: 'types-64', instructions: '101.5M', cycles: '128.4M', memory: '978.1KiB')] #[ExpectedFor(dataSet: 'types-256', instructions: '315.7M', cycles: '400.5M', memory: '3.128MiB')] public function benchUnionConstantArraysWithOwnKeys(int $types): Type { diff --git a/tests/bench/UnionTypeBench.php b/tests/bench/UnionTypeBench.php index ccbe8abba63..8212eedc543 100644 --- a/tests/bench/UnionTypeBench.php +++ b/tests/bench/UnionTypeBench.php @@ -78,7 +78,7 @@ public function boot(int $members): void #[DataProvider(method: 'members')] #[ExpectedFor(dataSet: 'members-16', instructions: '1.728M', cycles: '2.738M', memory: '16.65KiB')] #[ExpectedFor(dataSet: 'members-64', instructions: '7.620M', cycles: '10.73M', memory: '44.40KiB')] - #[ExpectedFor(dataSet: 'members-256', instructions: '39.92M', cycles: '63.68M', memory: '198.8KiB')] + #[ExpectedFor(dataSet: 'members-256', instructions: '33.75M', cycles: '45.31M', memory: '176.8KiB')] public function benchDescribeIntersections(int $members): string { if ($this->intersections === null) { @@ -92,9 +92,9 @@ public function benchDescribeIntersections(int $members): string * The value types of the member arrays are unioned. */ #[DataProvider(method: 'members')] - #[ExpectedFor(dataSet: 'members-16', instructions: '151.6K', cycles: '286.2K', memory: '4.680KiB')] - #[ExpectedFor(dataSet: 'members-64', instructions: '573.3K', cycles: '796.1K', memory: '12.18KiB')] - #[ExpectedFor(dataSet: 'members-256', instructions: '2.259M', cycles: '2.771M', memory: '62.18KiB')] + #[ExpectedFor(dataSet: 'members-16', instructions: '154.8K', cycles: '290.0K', memory: '4.680KiB')] + #[ExpectedFor(dataSet: 'members-64', instructions: '586.2K', cycles: '786.8K', memory: '12.18KiB')] + #[ExpectedFor(dataSet: 'members-256', instructions: '2.312M', cycles: '2.827M', memory: '62.18KiB')] public function benchGetIterableValueType(int $members): Type { if ($this->arrays === null) { diff --git a/tests/bench/data/bug-4300.php b/tests/bench/data/bug-4300.php index deb0f93114c..14f94eec7f2 100644 --- a/tests/bench/data/bug-4300.php +++ b/tests/bench/data/bug-4300.php @@ -1,9 +1,9 @@