NotificationsYou must be signed in to change notification settings
Fork3.1k
Star20.1k

Commitac646c0

authored

[mypyc] feat: optimize f-string building from Final values (#19611)

We can do some extra constant folding in cases like this:```pythonfrom typing import FinalBASE_URL: Final = "https://example.com"PORT: Final = 1234def get_url(endpoint: str) -> str: return f"{BASE_URL}:{PORT}/{endpoint}"```which should generate the same C code as```pythondef get_url(endpoint: str) -> str: return f"https://example.com:1234/{endpoint}"```This PR makes it so.

1 parent8e66cf2 commitac646c0Copy full SHA for ac646c0

File tree

3 files changed

+61

-2

lines changed

mypyc
- irbuild
  - format_str_tokenizer.py
  - specialize.py
- test-data
  - irbuild-str.test

3 files changed

+61

-2

lines changed

`‎mypyc/irbuild/format_str_tokenizer.py‎`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`)`
`13`	`13`	`frommypy.errorsimportErrors`
`14`	`14`	`frommypy.messagesimportMessageBuilder`
`15`		`-frommypy.nodesimportContext,Expression`
	`15`	`+frommypy.nodesimportContext,Expression,StrExpr`
`16`	`16`	`frommypy.optionsimportOptions`
`17`	`17`	`frommypyc.ir.opsimportInteger,Value`
`18`	`18`	`frommypyc.ir.rtypesimport (`
`@@ -143,7 +143,9 @@ def convert_format_expr_to_str(`
`143`	`143`	`forx,format_opinzip(exprs,format_ops):`
`144`	`144`	`node_type=builder.node_type(x)`
`145`	`145`	`ifformat_op==FormatOp.STR:`
`146`		`-ifis_str_rprimitive(node_type):`
	`146`	`+ifis_str_rprimitive(node_type)orisinstance(`
	`147`	`+x,StrExpr`
	`148`	`+ ):# NOTE: why does mypyc think our fake StrExprs are not str rprimitives?`
`147`	`149`	`var_str=builder.accept(x)`
`148`	`150`	`elifis_int_rprimitive(node_type)oris_short_int_rprimitive(node_type):`
`149`	`151`	`var_str=builder.primitive_op(int_to_str_op, [builder.accept(x)],line)`

`‎mypyc/irbuild/specialize.py‎`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`RefExpr,`
`32`	`32`	`StrExpr,`
`33`	`33`	`TupleExpr,`
	`34`	`+Var,`
`34`	`35`	`)`
`35`	`36`	`frommypy.typesimportAnyType,TypeOfAny`
`36`	`37`	`frommypyc.ir.opsimport (`
`@@ -710,6 +711,22 @@ def translate_fstring(builder: IRBuilder, expr: CallExpr, callee: RefExpr) -> Va`
`710`	`711`	`format_ops.append(FormatOp.STR)`
`711`	`712`	`exprs.append(item.args[0])`
`712`	`713`
	`714`	`+defget_literal_str(expr:Expression)->str\|None:`
	`715`	`+ifisinstance(expr,StrExpr):`
	`716`	`+returnexpr.value`
	`717`	`+elifisinstance(expr,RefExpr)andisinstance(expr.node,Var)andexpr.node.is_final:`
	`718`	`+returnstr(expr.node.final_value)`
	`719`	`+returnNone`
	`720`	`+`
	`721`	`+foriinrange(len(exprs)-1):`
	`722`	`+while (`
	`723`	`+len(exprs)>=i+2`
	`724`	`+and (first:=get_literal_str(exprs[i]))isnotNone`
	`725`	`+and (second:=get_literal_str(exprs[i+1]))isnotNone`
	`726`	`+ ):`
	`727`	`+exprs= [exprs[:i],StrExpr(first+second),exprs[i+2 :]]`
	`728`	`+format_ops= [format_ops[:i],FormatOp.STR,format_ops[i+2 :]]`
	`729`	`+`
`713`	`730`	`substitutions=convert_format_expr_to_str(builder,format_ops,exprs,expr.line)`
`714`	`731`	`ifsubstitutionsisNone:`
`715`	`732`	`returnNone`

`‎mypyc/test-data/irbuild-str.test‎`

Lines changed: 40 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -605,3 +605,43 @@ L3:`
`605`	`605`	`r6 = r7`
`606`	`606`	`L4:`
`607`	`607`	`return r6`
	`608`	`+`
	`609`	`+[case testFStringFromConstants]`
	`610`	`+from typing import Final`
	`611`	`+string: Final = "abc"`
	`612`	`+integer: Final = 123`
	`613`	`+floating: Final = 3.14`
	`614`	`+boolean: Final = True`
	`615`	`+`
	`616`	`+def test(x: str) -> str:`
	`617`	`+ return f"{string}{integer}{floating}{boolean}{x}{boolean}{floating}{integer}{string}{x}{string}{integer}{floating}{boolean}"`
	`618`	`+def test2(x: str) -> str:`
	`619`	`+ return f"{string}{integer}{floating}{boolean}{x}{boolean}{floating}{integer}{string}{x}{string}{integer}{floating}{boolean}{x}"`
	`620`	`+def test3(x: str) -> str:`
	`621`	`+ return f"{x}{string}{integer}{floating}{boolean}{x}{boolean}{floating}{integer}{string}{x}{string}{integer}{floating}{boolean}{x}"`
	`622`	`+`
	`623`	`+[out]`
	`624`	`+def test(x):`
	`625`	`+ x, r0, r1, r2, r3 :: str`
	`626`	`+L0:`
	`627`	`+ r0 = 'abc1233.14True'`
	`628`	`+ r1 = 'True3.14123abc'`
	`629`	`+ r2 = 'abc1233.14True'`
	`630`	`+ r3 = CPyStr_Build(5, r0, x, r1, x, r2)`
	`631`	`+ return r3`
	`632`	`+def test2(x):`
	`633`	`+ x, r0, r1, r2, r3 :: str`
	`634`	`+L0:`
	`635`	`+ r0 = 'abc1233.14True'`
	`636`	`+ r1 = 'True3.14123abc'`
	`637`	`+ r2 = 'abc1233.14True'`
	`638`	`+ r3 = CPyStr_Build(6, r0, x, r1, x, r2, x)`
	`639`	`+ return r3`
	`640`	`+def test3(x):`
	`641`	`+ x, r0, r1, r2, r3 :: str`
	`642`	`+L0:`
	`643`	`+ r0 = 'abc1233.14True'`
	`644`	`+ r1 = 'True3.14123abc'`
	`645`	`+ r2 = 'abc1233.14True'`
	`646`	`+ r3 = CPyStr_Build(7, x, r0, x, r1, x, r2, x)`
	`647`	`+ return r3`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitac646c0

File tree

3 files changed

3 files changed

`‎mypyc/irbuild/format_str_tokenizer.py‎`

`‎mypyc/irbuild/specialize.py‎`

`‎mypyc/test-data/irbuild-str.test‎`

0 commit comments