Unreviewed changes
9 is the latest approved patch-set.
The change was submitted with unreviewed changes in the following files:
```
The name of the file: src/simd/archsimd/_gen/tmplgen/main.go
Insertions: 1, Deletions: 0.
@@ -1402,6 +1402,7 @@
const (
phase0Start = iota
+ phase0Export
phase1Op
phase2Core
phase3Compile
```
```
The name of the file: src/simd/archsimd/_gen/simdgen/main.go
Insertions: 7, Deletions: 5.
@@ -143,15 +143,15 @@
var splitPhase = phase0Start
var (
+ title = identity
+
splitOpPkg = "cmd/compile/internal/ssa"
splitCorePath = "cmd/compile/internal/ssa"
splitCorePkg = "ssa"
splitCorePrefix = ""
- splitCoreTitle = identity
splitConvPrefix = ""
- splitConvTitle = identity
)
var splitFuncs = template.FuncMap{
@@ -159,7 +159,7 @@
"OpPkg": func() string { return path.Base(splitOpPkg) },
"CoreImport": func() string { return strconv.Quote(splitCorePath) },
"CorePkg": func() string { return splitCorePkg },
- "ConvName": func(name string) string { return splitConvPrefix + splitConvTitle(name) },
+ "ConvName": func(name string) string { return splitConvPrefix + title(name) },
}
func identity(s string) string { return s }
@@ -168,6 +168,7 @@
const (
phase0Start = iota
+ phase0Export
phase1Op
phase2Core
phase3Compile
@@ -177,6 +178,9 @@
)
func init() {
+ if splitPhase >= phase0Export {
+ title = simpleTitle
+ }
if splitPhase >= phase1Op {
splitOpPkg = "cmd/compile/internal/ssa/ssaop"
}
@@ -184,7 +188,6 @@
splitCorePath = "cmd/compile/internal/ssa/ssacore"
splitCorePkg = "ssacore"
splitCorePrefix = "ssacore."
- splitCoreTitle = simpleTitle
}
if splitPhase >= phase4CoreRename {
splitCorePath = "cmd/compile/internal/ssa"
@@ -193,7 +196,6 @@
}
if splitPhase >= phase5Conv {
splitConvPrefix = "ssa."
- splitConvTitle = simpleTitle
}
}
```
```
The name of the file: src/simd/archsimd/_gen/simdgen/gen_simdrules.go
Insertions: 5, Deletions: 5.
@@ -393,7 +393,7 @@
origArgs = after
}
immArg = "[c] "
- immArgCombineOff = " [" + splitCorePrefix + splitCoreTitle("makeValAndOff") + "(int32(uint8(c)),off)] "
+ immArgCombineOff = " [" + splitCorePrefix + title("makeValAndOff") + "(int32(uint8(c)),off)] "
}
memOpData.ArgsLoadAddr = immArg + origArgs + fmt.Sprintf("l:(VMOVDQUload%d {sym} [off] ptr mem)", *lastVreg.Bits)
// Remove the last vreg from the arg and change it to "ptr".
@@ -406,9 +406,9 @@
if gOp.MemFeaturesData != nil {
_, feat2 := getVbcstData(*gOp.MemFeaturesData)
knownFeatChecks := map[string]string{
- "AVX": "v.Block.CPUfeatures." + splitCoreTitle("hasFeature") + "(" + splitCorePrefix + "CPUavx)",
- "AVX2": "v.Block.CPUfeatures." + splitCoreTitle("hasFeature") + "(" + splitCorePrefix + "CPUavx2)",
- "AVX512": "v.Block.CPUfeatures." + splitCoreTitle("hasFeature") + "(" + splitCorePrefix + "CPUavx512)",
+ "AVX": "v.Block.CPUfeatures." + title("hasFeature") + "(" + splitCorePrefix + "CPUavx)",
+ "AVX2": "v.Block.CPUfeatures." + title("hasFeature") + "(" + splitCorePrefix + "CPUavx2)",
+ "AVX512": "v.Block.CPUfeatures." + title("hasFeature") + "(" + splitCorePrefix + "CPUavx512)",
}
memOpData.FeatCheck = knownFeatChecks[feat2]
memOpData.TplName = "vregMemFeatCheck"
@@ -438,7 +438,7 @@
noMaskName := machineOpName(NoMask, gOp)
ruleExisting, ok := maskedMergeOpts[noMaskName]
rule := fmt.Sprintf("(VPBLENDVB%d dst (%s %s) mask) && v.Block.CPUfeatures.%s(%sCPUavx512) => (%sMerging dst %s (VPMOVVec%dx%dToM <types.TypeMask> mask))\n",
- *maskElem.Bits, noMaskName, data.Args, splitCoreTitle("hasFeature"), splitCorePrefix, data.Asm, data.Args, *maskElem.ElemBits, *maskElem.Lanes)
+ *maskElem.Bits, noMaskName, data.Args, title("hasFeature"), splitCorePrefix, data.Asm, data.Args, *maskElem.ElemBits, *maskElem.Lanes)
if ok && ruleExisting != rule {
panic(fmt.Sprintf("multiple masked merge rules for one op:\n%s\n%s\n", ruleExisting, rule))
} else {
```
```
The name of the file: src/simd/archsimd/_gen/wasmgen/main.go
Insertions: 1, Deletions: 0.
@@ -46,6 +46,7 @@
const (
phase0Start = iota
+ phase0Export
phase1Op
phase2Core
phase3Compile
```