Skip to content

chore: vectorized map feature flag removal #5291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 18, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions compiler/vectorized_test.go
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/influxdata/flux/compiler"
"github.com/influxdata/flux/execute/executetest"
fluxfeature "github.com/influxdata/flux/internal/feature"
"github.com/influxdata/flux/internal/pkg/feature"
"github.com/influxdata/flux/memory"
"github.com/influxdata/flux/runtime"
@@ -763,9 +762,6 @@ func TestVectorizedFns(t *testing.T) {
if flagger == nil {
flagger = executetest.TestFlagger{}
}
flagger[fluxfeature.VectorizedConditionals().Key()] = true
flagger[fluxfeature.VectorizedFloat().Key()] = true
flagger[fluxfeature.VectorizedUnaryOps().Key()] = true
ctx := context.Background()
ctx = feature.Inject(
ctx,
42 changes: 0 additions & 42 deletions internal/feature/flags.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 0 additions & 18 deletions internal/feature/flags.yml
Original file line number Diff line number Diff line change
@@ -70,24 +70,6 @@
default: 0
contact: Jonathan Sternberg, Adrian Thurston

- name: Vectorized Conditionals
description: Calls to map can be vectorized when conditional expressions appear in the function
key: vectorizedConditionals
default: false
contact: Owen Nelson

- name: Vectorized Float
description: Calls to map can be vectorized when float casts appear in the function
key: vectorizedFloat
default: false
contact: Owen Nelson

- name: Vectorized Unary Ops
description: Calls to map can be vectorized when unary ops appear in the function
key: vectorizedUnaryOps
default: false
contact: Owen Nelson

- name: StrictNullLogicalOps
description: When enabled, nulls in logical expressions should match the behavior language spec.
key: strictNullLogicalOps
12 changes: 0 additions & 12 deletions libflux/flux-core/src/semantic/mod.rs
Original file line number Diff line number Diff line change
@@ -517,18 +517,6 @@ pub enum Feature {

/// Enables formatting with codespan for errors
PrettyError,

/// Enables calls to map to be vectorized when the function contains
/// conditional expressions.
VectorizedConditionals,

/// Enables calls to map to be vectorized when the function contains
/// float casts.
VectorizedFloat,

/// Enables calls to map to be vectorized when the function contains
/// unary operators like: add, sub exists, not.
VectorizedUnaryOps,
}

impl FromStr for Feature {
11 changes: 2 additions & 9 deletions libflux/flux-core/src/semantic/tests/vectorize.rs
Original file line number Diff line number Diff line change
@@ -2,18 +2,11 @@ use super::*;
use crate::semantic::{
nodes::{FunctionExpr, Package},
walk::{walk, Node},
AnalyzerConfig, Feature,
AnalyzerConfig,
};

fn analyzer_config() -> AnalyzerConfig {
AnalyzerConfig {
features: vec![
Feature::VectorizedConditionals,
Feature::VectorizedFloat,
Feature::VectorizedUnaryOps,
],
..AnalyzerConfig::default()
}
AnalyzerConfig::default()
}

fn vectorize(src: &str) -> anyhow::Result<Package> {
30 changes: 10 additions & 20 deletions libflux/flux-core/src/semantic/vectorize.rs
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ use crate::{
Property, Result, ReturnStmt, UnaryExpr,
},
types::{self, Function, Label, MonoType},
AnalyzerConfig, Feature, Symbol,
AnalyzerConfig, Symbol,
},
};

@@ -99,9 +99,7 @@ impl Expression {
property: member.property.clone(),
}))
}
Expression::Unary(unary)
if env.config.features.contains(&Feature::VectorizedUnaryOps) =>
{
Expression::Unary(unary) => {
return Ok(Expression::Unary(Box::new(UnaryExpr {
loc: unary.loc.clone(),
typ: MonoType::vector(unary.typ.clone()),
@@ -142,20 +140,13 @@ impl Expression {
right,
}))
}
Expression::Conditional(expr)
if env
.config
.features
.contains(&Feature::VectorizedConditionals) =>
{
Expression::Conditional(Box::new(ConditionalExpr {
loc: expr.loc.clone(),
test: expr.test.vectorize(env)?,
consequent: expr.consequent.vectorize(env)?,
alternate: expr.alternate.vectorize(env)?,
typ: MonoType::vector(expr.typ.clone()),
}))
}
Expression::Conditional(expr) => Expression::Conditional(Box::new(ConditionalExpr {
loc: expr.loc.clone(),
test: expr.test.vectorize(env)?,
consequent: expr.consequent.vectorize(env)?,
alternate: expr.alternate.vectorize(env)?,
typ: MonoType::vector(expr.typ.clone()),
})),
expr @ Expression::Integer(_) => wrap_vec_repeat(expr.clone()),
expr @ Expression::DateTime(_) => wrap_vec_repeat(expr.clone()),
expr @ Expression::Float(_) => wrap_vec_repeat(expr.clone()),
@@ -175,8 +166,7 @@ impl CallExpr {
fn vectorize(&self, env: &VectorizeEnv) -> Result<Self> {
match &self.callee {
ident @ Expression::Identifier(IdentifierExpr { name, .. }) => {
if env.config.features.contains(&Feature::VectorizedFloat)
&& name == "float"
if name == "float"
&& name.package() == Some("universe")
&& self.arguments.len() == 1
&& self.arguments[0].key.name == "v"
3 changes: 0 additions & 3 deletions libflux/go/libflux/analyze.go
Original file line number Diff line number Diff line change
@@ -53,9 +53,6 @@ type Options struct {
func NewOptions(ctx context.Context) Options {
var features []string
features = addFlag(ctx, features, feature.PrettyError())
features = addFlag(ctx, features, feature.VectorizedConditionals())
features = addFlag(ctx, features, feature.VectorizedFloat())
features = addFlag(ctx, features, feature.VectorizedUnaryOps())
features = addFlag(ctx, features, feature.LabelPolymorphism())
features = addFlag(ctx, features, feature.UnusedSymbolWarnings())
return Options{Features: features}
4 changes: 2 additions & 2 deletions libflux/go/libflux/buildinfo.gen.go
Original file line number Diff line number Diff line change
@@ -49,12 +49,12 @@ var sourceHashes = map[string]string{
"libflux/flux-core/src/semantic/fs.rs": "f7f609bc8149769d99b737150e184a2d54029c0b768365dbcf08ff193b0e1f6f",
"libflux/flux-core/src/semantic/import.rs": "184e955211db1ceb1be782b4daf75584b86907b1428e50015497909cfc2dd89a",
"libflux/flux-core/src/semantic/infer.rs": "b6d18c94b58da27aebb5828f6471768ccc52e679a1356c6a38d0f3cd01a06dce",
"libflux/flux-core/src/semantic/mod.rs": "6816a6b3d40f75756547f004cfbfe51988e577320d02a9adc6d757ec8670c07f",
"libflux/flux-core/src/semantic/mod.rs": "56196a6edd50ebf812c74293d58557b5c0a7e51cd8c92f38d73f52ef15af40f6",
"libflux/flux-core/src/semantic/nodes.rs": "a35e2e194a0369080d413db4f1f132d5b32fd4d3cff50ce47f505cc4e31fc2b8",
"libflux/flux-core/src/semantic/sub.rs": "8bc05ffff0990facea2130e0faf5a837f8663d59996ff85869c6e631ac654553",
"libflux/flux-core/src/semantic/symbols.rs": "f061d57fe4ef7f23d0adad80d43fe1c8ae92d5e25a0da4b81e21b8087e30d253",
"libflux/flux-core/src/semantic/types.rs": "2e3ee9dc324778b3c2b033af148650983f01e830f83546c7f1089fd2bdf7e6a6",
"libflux/flux-core/src/semantic/vectorize.rs": "eda5347c1257a6541727c50d90f49f6b10876017f6c51ad98d10f90388b5dbaf",
"libflux/flux-core/src/semantic/vectorize.rs": "ec4a374bbf406b981b861d5b17d8ccfcbcd22c7f345132fe2335541dacb228e9",
"libflux/flux-core/src/semantic/walk/_walk.rs": "285b7e9237e218954eddcdabeaa0a7cadd566af30ad96f714faf1b5fbcc05544",
"libflux/flux-core/src/semantic/walk/mod.rs": "1f8b312b728692eeea0deaa8c608b60019f5c32bd8ed3355133608102851442c",
"libflux/flux-core/src/semantic/walk/test_utils.rs": "043d5137ed626f1990c89f639e867e5b33a906f13c427313b497062f98215846",