git.delta.rocks / jrsonnet / refs/commits / f5b072424acc

difftreelog

perf(evaluator) remove inline attribute

Лач2020-06-25parent: #1a55b09.patch.diff
in: master

6 files changed

modifiedcrates/jsonnet-evaluator/Cargo.tomldiffbeforeafterboth
--- a/crates/jsonnet-evaluator/Cargo.toml
+++ b/crates/jsonnet-evaluator/Cargo.toml
@@ -10,6 +10,7 @@
 default = ["serialized-stdlib", "faster"]
 serialized-stdlib = ["serde", "bincode"]
 # Replace some standard library functions with faster implementations
+# Library works fine without this feature, but requires more memory and time for std function calls
 faster = []
 
 [dependencies]
modifiedcrates/jsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
--- a/crates/jsonnet-evaluator/src/evaluate.rs
+++ b/crates/jsonnet-evaluator/src/evaluate.rs
@@ -168,7 +168,6 @@
 future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);
 future_wrapper!(ObjValue, FutureObjValue);
 
-#[inline(always)]
 pub fn evaluate_comp<T>(
 	context: Context,
 	value: &impl Fn(Context) -> Result<T>,
@@ -370,7 +369,6 @@
 	})
 }
 
-#[inline(always)]
 pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {
 	use Expr::*;
 	let locexpr = expr.clone();
@@ -731,8 +729,7 @@
 					(ns, name) => panic!("Intristic not found: {}.{}", ns, name),
 				},
 				Val::Func(f) => {
-					let body = #[inline(always)]
-					|| f.evaluate(context, args, *tailstrict);
+					let body = || f.evaluate(context, args, *tailstrict);
 					if *tailstrict {
 						body()?
 					} else {
modifiedcrates/jsonnet-evaluator/src/function.rsdiffbeforeafterboth
before · crates/jsonnet-evaluator/src/function.rs
1use crate::{create_error, evaluate, lazy_val, resolved_lazy_val, Context, Error, Result, Val};2use closure::closure;3use jsonnet_parser::{ArgsDesc, ParamsDesc};4use std::collections::HashMap;56/// Creates correct [context](Context) for function body evaluation, returning error on invalid call7///8/// * `ctx` used for passed argument expressions execution, and for body execution (if `body_ctx` is not set)9/// * `body_ctx` used for default parameter values execution, and for body execution (if set)10/// * `params` function parameters definition11/// * `args` passed function arguments12/// * `tailstruct` if true - function arguments is eager executed, otherwise - lazy13pub fn parse_function_call(14	ctx: Context,15	body_ctx: Option<Context>,16	params: &ParamsDesc,17	args: &ArgsDesc,18	tailstrict: bool,19) -> Result<Context> {20	inline_parse_function_call(ctx, body_ctx, params, args, tailstrict)21}2223/// See [parse_function_call](parse_function_call)24///25/// ## Notes26/// This function is always inlined for tailstrict27#[inline(always)]28pub(crate) fn inline_parse_function_call(29	ctx: Context,30	body_ctx: Option<Context>,31	params: &ParamsDesc,32	args: &ArgsDesc,33	tailstrict: bool,34) -> Result<Context> {35	let mut out = HashMap::new();36	let mut positioned_args = vec![None; params.0.len()];37	for (id, arg) in args.iter().enumerate() {38		let idx = if let Some(name) = &arg.0 {39			params.iter().position(|p| &p.0 == name).ok_or_else(|| {40				create_error::<()>(Error::UnknownFunctionParameter(name.clone()))41					.err()42					.unwrap()43			})?44		} else {45			id46		};4748		if idx >= params.len() {49			create_error(Error::TooManyArgsFunctionHas(params.len()))?;50		}51		if positioned_args[idx].is_some() {52			create_error(Error::BindingParameterASecondTime(params[idx].0.clone()))?;53		}54		positioned_args[idx] = Some(arg.1.clone());55	}56	// Fill defaults57	for (id, p) in params.iter().enumerate() {58		let (ctx, expr) = if let Some(arg) = &positioned_args[id] {59			(ctx.clone(), arg)60		} else if let Some(default) = &p.1 {61			(62				body_ctx63					.clone()64					.expect("no default context set for call with defined default parameter value"),65				default,66			)67		} else {68			create_error(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;69			unreachable!()70		};71		let val = if tailstrict {72			resolved_lazy_val!(evaluate(ctx, expr)?)73		} else {74			lazy_val!(closure!(clone ctx, clone expr, ||evaluate(ctx.clone(), &expr)))75		};76		out.insert(p.0.clone(), val);77	}7879	Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)80}8182#[inline(always)]83pub(crate) fn place_args(84	ctx: Context,85	body_ctx: Option<Context>,86	params: &ParamsDesc,87	args: &[Val],88) -> Result<Context> {89	let mut out = HashMap::new();90	let mut positioned_args = vec![None; params.0.len()];91	for (id, arg) in args.iter().enumerate() {92		if id >= params.len() {93			create_error(Error::TooManyArgsFunctionHas(params.len()))?;94		}95		positioned_args[id] = Some(arg);96	}97	// Fill defaults98	for (id, p) in params.iter().enumerate() {99		let val = if let Some(arg) = &positioned_args[id] {100			(*arg).clone()101		} else if let Some(default) = &p.1 {102			evaluate(ctx.clone(), default)?103		} else {104			create_error(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;105			unreachable!()106		};107		out.insert(p.0.clone(), resolved_lazy_val!(val));108	}109110	Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)111}
after · crates/jsonnet-evaluator/src/function.rs
1use crate::{create_error, evaluate, lazy_val, resolved_lazy_val, Context, Error, Result, Val};2use closure::closure;3use jsonnet_parser::{ArgsDesc, ParamsDesc};4use std::collections::HashMap;56/// Creates correct [context](Context) for function body evaluation, returning error on invalid call7///8/// * `ctx` used for passed argument expressions execution, and for body execution (if `body_ctx` is not set)9/// * `body_ctx` used for default parameter values execution, and for body execution (if set)10/// * `params` function parameters definition11/// * `args` passed function arguments12/// * `tailstruct` if true - function arguments is eager executed, otherwise - lazy13pub fn parse_function_call(14	ctx: Context,15	body_ctx: Option<Context>,16	params: &ParamsDesc,17	args: &ArgsDesc,18	tailstrict: bool,19) -> Result<Context> {20	inline_parse_function_call(ctx, body_ctx, params, args, tailstrict)21}2223/// See [parse_function_call](parse_function_call)24///25/// ## Notes26/// This function is always inlined for tailstrict27pub(crate) fn inline_parse_function_call(28	ctx: Context,29	body_ctx: Option<Context>,30	params: &ParamsDesc,31	args: &ArgsDesc,32	tailstrict: bool,33) -> Result<Context> {34	let mut out = HashMap::new();35	let mut positioned_args = vec![None; params.0.len()];36	for (id, arg) in args.iter().enumerate() {37		let idx = if let Some(name) = &arg.0 {38			params.iter().position(|p| &p.0 == name).ok_or_else(|| {39				create_error::<()>(Error::UnknownFunctionParameter(name.clone()))40					.err()41					.unwrap()42			})?43		} else {44			id45		};4647		if idx >= params.len() {48			create_error(Error::TooManyArgsFunctionHas(params.len()))?;49		}50		if positioned_args[idx].is_some() {51			create_error(Error::BindingParameterASecondTime(params[idx].0.clone()))?;52		}53		positioned_args[idx] = Some(arg.1.clone());54	}55	// Fill defaults56	for (id, p) in params.iter().enumerate() {57		let (ctx, expr) = if let Some(arg) = &positioned_args[id] {58			(ctx.clone(), arg)59		} else if let Some(default) = &p.1 {60			(61				body_ctx62					.clone()63					.expect("no default context set for call with defined default parameter value"),64				default,65			)66		} else {67			create_error(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;68			unreachable!()69		};70		let val = if tailstrict {71			resolved_lazy_val!(evaluate(ctx, expr)?)72		} else {73			lazy_val!(closure!(clone ctx, clone expr, ||evaluate(ctx.clone(), &expr)))74		};75		out.insert(p.0.clone(), val);76	}7778	Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)79}8081pub(crate) fn place_args(82	ctx: Context,83	body_ctx: Option<Context>,84	params: &ParamsDesc,85	args: &[Val],86) -> Result<Context> {87	let mut out = HashMap::new();88	let mut positioned_args = vec![None; params.0.len()];89	for (id, arg) in args.iter().enumerate() {90		if id >= params.len() {91			create_error(Error::TooManyArgsFunctionHas(params.len()))?;92		}93		positioned_args[id] = Some(arg);94	}95	// Fill defaults96	for (id, p) in params.iter().enumerate() {97		let val = if let Some(arg) = &positioned_args[id] {98			(*arg).clone()99		} else if let Some(default) = &p.1 {100			evaluate(ctx.clone(), default)?101		} else {102			create_error(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;103			unreachable!()104		};105		out.insert(p.0.clone(), resolved_lazy_val!(val));106	}107108	Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)109}
modifiedcrates/jsonnet-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jsonnet-evaluator/src/lib.rs
+++ b/crates/jsonnet-evaluator/src/lib.rs
@@ -2,7 +2,6 @@
 #![feature(type_alias_impl_trait)]
 #![feature(debug_non_exhaustive)]
 #![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]
-#![feature(stmt_expr_attributes)]
 mod ctx;
 mod dynamic;
 mod error;
@@ -81,17 +80,14 @@
 	/// Global state is fine there
 	pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)
 }
-#[inline(always)]
 pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {
 	EVAL_STATE.with(
-		#[inline(always)]
 		|s| f(s.borrow().as_ref().unwrap()),
 	)
 }
 pub(crate) fn create_error<T>(err: Error) -> Result<T> {
 	with_state(|s| s.error(err))
 }
-#[inline(always)]
 pub(crate) fn push<T>(e: LocExpr, comment: String, f: impl FnOnce() -> Result<T>) -> Result<T> {
 	with_state(|s| s.push(e, comment, f))
 }
@@ -251,7 +247,6 @@
 		Context::new().extend_unbound(new_bindings, None, None, None)
 	}
 
-	#[inline(always)]
 	pub fn push<T>(&self, e: LocExpr, comment: String, f: impl FnOnce() -> Result<T>) -> Result<T> {
 		{
 			let mut stack = self.0.stack.borrow_mut();
@@ -287,7 +282,6 @@
 		Err(LocError(err, self.stack_trace()))
 	}
 
-	#[inline(always)]
 	fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {
 		EVAL_STATE.with(|v| {
 			let has_state = v.borrow().is_some();
modifiedcrates/jsonnet-evaluator/src/map.rsdiffbeforeafterboth
--- a/crates/jsonnet-evaluator/src/map.rs
+++ b/crates/jsonnet-evaluator/src/map.rs
@@ -18,7 +18,6 @@
 		}))
 	}
 
-	#[inline(always)]
 	pub fn get<Q: ?Sized>(&self, key: &Q) -> Option<&V>
 	where
 		K: Borrow<Q>,
modifiedcrates/jsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jsonnet-evaluator/src/val.rs
+++ b/crates/jsonnet-evaluator/src/val.rs
@@ -77,7 +77,6 @@
 }
 impl FuncDesc {
 	/// This function is always inlined to make tailstrict work
-	#[inline(always)]
 	pub fn evaluate(&self, call_ctx: Context, args: &ArgsDesc, tailstrict: bool) -> Result<Val> {
 		let ctx = inline_parse_function_call(
 			call_ctx,
@@ -89,7 +88,6 @@
 		evaluate(ctx, &self.body)
 	}
 
-	#[inline(always)]
 	pub fn evaluate_values(&self, call_ctx: Context, args: &[Val]) -> Result<Val> {
 		let ctx = place_args(call_ctx, Some(self.ctx.clone()), &self.params, args)?;
 		evaluate(ctx, &self.body)