Skip to content

Commit 750679f

Browse files
electricessenceelectricessence
committed
Performance tweaks and cleanup.
Updated version.
1 parent 2e6da08 commit 750679f

44 files changed

Lines changed: 764 additions & 456 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 221 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,221 @@
1+
# Remove the line below if you want to inherit .editorconfig settings from higher directories
2+
root = true
3+
4+
# C# files
5+
[*.cs]
6+
7+
#### Core EditorConfig Options ####
8+
9+
# Indentation and spacing
10+
indent_size = 4
11+
indent_style = space
12+
tab_width = 4
13+
14+
# New line preferences
15+
end_of_line = crlf
16+
insert_final_newline = false
17+
18+
#### .NET Coding Conventions ####
19+
20+
# Organize usings
21+
dotnet_separate_import_directive_groups = false
22+
dotnet_sort_system_directives_first = false
23+
file_header_template = unset
24+
25+
# this. and Me. preferences
26+
dotnet_style_qualification_for_event = false:suggestion
27+
dotnet_style_qualification_for_field = false
28+
dotnet_style_qualification_for_method = false:suggestion
29+
dotnet_style_qualification_for_property = false:suggestion
30+
31+
# Language keywords vs BCL types preferences
32+
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
33+
dotnet_style_predefined_type_for_member_access = true:suggestion
34+
35+
# Parentheses preferences
36+
dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:suggestion
37+
dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary:suggestion
38+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:suggestion
39+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:suggestion
40+
41+
# Modifier preferences
42+
dotnet_style_require_accessibility_modifiers = for_non_interface_members
43+
44+
# Expression-level preferences
45+
dotnet_style_coalesce_expression = true:warning
46+
dotnet_style_collection_initializer = true
47+
dotnet_style_explicit_tuple_names = true
48+
dotnet_style_namespace_match_folder = true
49+
dotnet_style_null_propagation = true:warning
50+
dotnet_style_object_initializer = true
51+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
52+
dotnet_style_prefer_auto_properties = true:suggestion
53+
dotnet_style_prefer_compound_assignment = true
54+
dotnet_style_prefer_conditional_expression_over_assignment = true:warning
55+
dotnet_style_prefer_conditional_expression_over_return = true:suggestion
56+
dotnet_style_prefer_inferred_anonymous_type_member_names = true
57+
dotnet_style_prefer_inferred_tuple_names = true
58+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
59+
dotnet_style_prefer_simplified_boolean_expressions = true:warning
60+
dotnet_style_prefer_simplified_interpolation = true
61+
62+
# Field preferences
63+
dotnet_style_readonly_field = true
64+
65+
# Parameter preferences
66+
dotnet_code_quality_unused_parameters = all
67+
68+
# Suppression preferences
69+
dotnet_remove_unnecessary_suppression_exclusions = none
70+
71+
# New line preferences
72+
dotnet_style_allow_multiple_blank_lines_experimental = false
73+
dotnet_style_allow_statement_immediately_after_block_experimental = false
74+
75+
#### C# Coding Conventions ####
76+
77+
# var preferences
78+
csharp_style_var_elsewhere = false
79+
csharp_style_var_for_built_in_types = false:suggestion
80+
csharp_style_var_when_type_is_apparent = true:suggestion
81+
82+
# Expression-bodied members
83+
csharp_style_expression_bodied_accessors = true:suggestion
84+
csharp_style_expression_bodied_constructors = true:suggestion
85+
csharp_style_expression_bodied_indexers = true:suggestion
86+
csharp_style_expression_bodied_lambdas = true:suggestion
87+
csharp_style_expression_bodied_local_functions = true:suggestion
88+
csharp_style_expression_bodied_methods = true:suggestion
89+
csharp_style_expression_bodied_operators = true:suggestion
90+
csharp_style_expression_bodied_properties = true:suggestion
91+
92+
# Pattern matching preferences
93+
csharp_style_pattern_matching_over_as_with_null_check = true:warning
94+
csharp_style_pattern_matching_over_is_with_cast_check = true:warning
95+
csharp_style_prefer_extended_property_pattern = true
96+
csharp_style_prefer_not_pattern = true:warning
97+
csharp_style_prefer_pattern_matching = true:suggestion
98+
csharp_style_prefer_switch_expression = true
99+
100+
# Null-checking preferences
101+
csharp_style_conditional_delegate_call = true:error
102+
103+
# Modifier preferences
104+
csharp_prefer_static_local_function = true
105+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
106+
107+
# Code-block preferences
108+
csharp_prefer_braces = when_multiline
109+
csharp_prefer_simple_using_statement = true
110+
csharp_style_namespace_declarations = file_scoped:suggestion
111+
112+
# Expression-level preferences
113+
csharp_prefer_simple_default_expression = true
114+
csharp_style_deconstructed_variable_declaration = true
115+
csharp_style_implicit_object_creation_when_type_is_apparent = true
116+
csharp_style_inlined_variable_declaration = true:warning
117+
csharp_style_prefer_index_operator = true
118+
csharp_style_prefer_local_over_anonymous_function = true
119+
csharp_style_prefer_null_check_over_type_check = true:warning
120+
csharp_style_prefer_range_operator = true
121+
csharp_style_prefer_tuple_swap = true
122+
csharp_style_throw_expression = true
123+
csharp_style_unused_value_assignment_preference = discard_variable
124+
csharp_style_unused_value_expression_statement_preference = discard_variable
125+
126+
# 'using' directive preferences
127+
csharp_using_directive_placement = outside_namespace:warning
128+
129+
# New line preferences
130+
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false:warning
131+
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:suggestion
132+
csharp_style_allow_embedded_statements_on_same_line_experimental = true
133+
134+
#### C# Formatting Rules ####
135+
136+
# New line preferences
137+
csharp_new_line_before_catch = true
138+
csharp_new_line_before_else = true
139+
csharp_new_line_before_finally = true
140+
csharp_new_line_before_members_in_anonymous_types = true
141+
csharp_new_line_before_members_in_object_initializers = true
142+
csharp_new_line_before_open_brace = all
143+
csharp_new_line_between_query_expression_clauses = true
144+
145+
# Indentation preferences
146+
csharp_indent_block_contents = true
147+
csharp_indent_braces = false
148+
csharp_indent_case_contents = true
149+
csharp_indent_case_contents_when_block = false
150+
csharp_indent_labels = flush_left
151+
csharp_indent_switch_labels = true
152+
153+
# Space preferences
154+
csharp_space_after_cast = false
155+
csharp_space_after_colon_in_inheritance_clause = true
156+
csharp_space_after_comma = true
157+
csharp_space_after_dot = false
158+
csharp_space_after_keywords_in_control_flow_statements = true
159+
csharp_space_after_semicolon_in_for_statement = true
160+
csharp_space_around_binary_operators = before_and_after
161+
csharp_space_around_declaration_statements = false
162+
csharp_space_before_colon_in_inheritance_clause = true
163+
csharp_space_before_comma = false
164+
csharp_space_before_dot = false
165+
csharp_space_before_open_square_brackets = false
166+
csharp_space_before_semicolon_in_for_statement = false
167+
csharp_space_between_empty_square_brackets = false
168+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
169+
csharp_space_between_method_call_name_and_opening_parenthesis = false
170+
csharp_space_between_method_call_parameter_list_parentheses = false
171+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
172+
csharp_space_between_method_declaration_name_and_open_parenthesis = false
173+
csharp_space_between_method_declaration_parameter_list_parentheses = false
174+
csharp_space_between_parentheses = false
175+
csharp_space_between_square_brackets = false
176+
177+
# Wrapping preferences
178+
csharp_preserve_single_line_blocks = true
179+
csharp_preserve_single_line_statements = true
180+
181+
#### Naming styles ####
182+
183+
# Naming rules
184+
185+
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
186+
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
187+
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
188+
189+
dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
190+
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
191+
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
192+
193+
dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
194+
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
195+
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
196+
197+
# Symbol specifications
198+
199+
dotnet_naming_symbols.interface.applicable_kinds = interface
200+
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
201+
dotnet_naming_symbols.interface.required_modifiers =
202+
203+
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
204+
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
205+
dotnet_naming_symbols.types.required_modifiers =
206+
207+
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
208+
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
209+
dotnet_naming_symbols.non_field_members.required_modifiers =
210+
211+
# Naming styles
212+
213+
dotnet_naming_style.pascal_case.required_prefix =
214+
dotnet_naming_style.pascal_case.required_suffix =
215+
dotnet_naming_style.pascal_case.word_separator =
216+
dotnet_naming_style.pascal_case.capitalization = pascal_case
217+
218+
dotnet_naming_style.begins_with_i.required_prefix = I
219+
dotnet_naming_style.begins_with_i.required_suffix =
220+
dotnet_naming_style.begins_with_i.word_separator =
221+
dotnet_naming_style.begins_with_i.capitalization = pascal_case

‎benchmarking/Benchmarks/CollectionBenchmark.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,56 +13,56 @@ public class CollectionBenchmark<T> : BenchmarkBase<Func<ICollection<T>>>
1313

1414
protected override IEnumerable<TimedResult> TestOnceInternal()
1515
{
16-
var c = Param();
16+
ICollection<T> c = Param();
1717

1818
yield return TimedResult.Measure("Fill (.Add(item))", () =>
1919
{
20-
for (var i = 0; i < TestSize; i++) c.Add(_items[i]);
20+
for (int i = 0; i < TestSize; i++) c.Add(_items[i]);
2121
});
2222

2323
yield return TimedResult.Measure("Enumerate", () =>
2424
{
25-
// ReSharper disable once NotAccessedVariable
26-
var x = 0;
25+
// ReSharper disable once NotAccessedVariable
26+
int x = 0;
2727
// ReSharper disable once LoopCanBeConvertedToQuery
28-
foreach (var _ in c) { x++; }
28+
foreach (T _ in c) { x++; }
2929
});
3030

3131
yield return TimedResult.Measure(".Contains(item)", () =>
3232
{
33-
for (var i = 0; i < TestSize; i++)
33+
for (int i = 0; i < TestSize; i++)
3434
{
35-
var _ = c.Contains(_items[i]);
35+
bool _ = c.Contains(_items[i]);
3636
}
3737
});
3838

3939
if (c is IList<T> list)
4040
{
4141
yield return TimedResult.Measure("IList<T> Read Access", () =>
4242
{
43-
for (var i = 0; i < TestSize; i += 2)
43+
for (int i = 0; i < TestSize; i += 2)
4444
{
45-
var _ = list[i];
45+
T _ = list[i];
4646
}
4747
});
4848
}
4949

5050
yield return TimedResult.Measure("Empty Backwards (.Remove(last))", () =>
5151
{
52-
for (var i = 0; i < TestSize; i++) c.Remove(_items[TestSize - i - 1]);
52+
for (int i = 0; i < TestSize; i++) c.Remove(_items[TestSize - i - 1]);
5353
});
5454

5555
yield return TimedResult.Measure("Refill (.Add(item))", () =>
5656
{
57-
for (var i = 0; i < TestSize; i++) c.Add(_items[i]);
57+
for (int i = 0; i < TestSize; i++) c.Add(_items[i]);
5858
});
5959

6060
yield return TimedResult.Measure("Empty Forwards (.Remove(first))", () =>
6161
{
62-
for (var i = 0; i < TestSize; i++) c.Remove(_items[i]);
62+
for (int i = 0; i < TestSize; i++) c.Remove(_items[i]);
6363
});
6464

65-
for (var i = 0; i < TestSize; i++) c.Add(_items[i]);
65+
for (int i = 0; i < TestSize; i++) c.Add(_items[i]);
6666

6767
yield return TimedResult.Measure(".Clear()", () => c.Clear());
6868
}

‎benchmarking/Benchmarks/CollectionParallelBenchmark.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,48 +14,48 @@ public CollectionParallelBenchmark(uint size, uint repeat, Func<ICollection<T>>
1414

1515
protected override IEnumerable<TimedResult> TestOnceInternal()
1616
{
17-
var c = Param();
17+
ICollection<T> c = Param();
1818

1919
yield return TimedResult.Measure("Fill (.Add(item)) (In Parallel)",
2020
() => Parallel.For(0, TestSize, i => c.Add(_items[i])));
2121

2222
yield return TimedResult.Measure("Enumerate", () =>
2323
{
24-
// ReSharper disable once NotAccessedVariable
25-
var x = 0;
24+
// ReSharper disable once NotAccessedVariable
25+
int x = 0;
2626
// ReSharper disable once LoopCanBeConvertedToQuery
27-
foreach (var _ in c) { x++; }
27+
foreach (T _ in c) { x++; }
2828
});
2929

3030
// It's obvious to note that you have to 'lock' a collection or acquire a 'snapshot' before enumerating.
3131
yield return TimedResult.Measure("Enumerate (In Parallel)",
3232
() => Parallel.ForEach(c, _ => { }));
3333

3434
yield return TimedResult.Measure(".Contains(item) (In Parallel)",
35-
() => Parallel.For(0, TestSize * 2, i => { var _ = c.Contains(_items[i]); }));
35+
() => Parallel.For(0, TestSize * 2, i => { bool _ = c.Contains(_items[i]); }));
3636

3737
if (c is IList<T> list)
3838
{
3939
yield return TimedResult.Measure("IList<T> Read Access", () =>
4040
{
41-
for (var i = 0; i < TestSize; i += 2)
41+
for (int i = 0; i < TestSize; i += 2)
4242
{
43-
var _ = list[i];
43+
T _ = list[i];
4444
}
4545
});
4646

4747
yield return TimedResult.Measure("IList<T> Read Access (In Parallel)",
48-
() => Parallel.For(0, (int)TestSize, i => { var _ = list[i]; }));
48+
() => Parallel.For(0, (int)TestSize, i => { T _ = list[i]; }));
4949
}
5050

5151
yield return c is ISynchronizedCollection<T> syncList
5252
? TimedResult.Measure(".Snapshot()", () =>
5353
{
54-
var _ = syncList.Snapshot();
54+
T[] _ = syncList.Snapshot();
5555
})
5656
: TimedResult.Measure(".Snapshot()", () =>
5757
{
58-
var _ = c.ToArray();
58+
T[] _ = c.ToArray();
5959
});
6060

6161
yield return TimedResult.Measure("Empty Backwards (.Remove(last)) (In Parallel)",

‎benchmarking/Benchmarks/DictionaryParallelBenchmark.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ public DictionaryParallelBenchmark(uint size, uint repeat, Func<IDictionary<int,
1515

1616
protected override IEnumerable<TimedResult> TestOnceInternal()
1717
{
18-
foreach (var t in base.TestOnceInternal())
18+
foreach (TimedResult t in base.TestOnceInternal())
1919
{
2020
yield return t;
2121
}
2222

2323
const int mixSize = 100;
2424
var c = (IDictionary<int, object>)Param();
25-
for (var i = 0; i < TestSize; i++) c.Add(_items[i]);
26-
var items = Enumerable.Range(0, mixSize).Select(_ => new object()).ToArray();
25+
for (int i = 0; i < TestSize; i++) c.Add(_items[i]);
26+
object[] items = Enumerable.Range(0, mixSize).Select(_ => new object()).ToArray();
2727

2828
yield return TimedResult.Measure("Random Set/Get", () =>
2929
{
30-
for (var i = 0; i < TestSize; i++)
30+
for (int i = 0; i < TestSize; i++)
3131
{
32-
var i1 = i;
32+
int i1 = i;
3333
Parallel.For(0, mixSize, x =>
3434
{
3535
if (x % 2 == 0)
@@ -38,7 +38,7 @@ protected override IEnumerable<TimedResult> TestOnceInternal()
3838
}
3939
else
4040
{
41-
var _ = c[i1];
41+
object _ = c[i1];
4242
}
4343
});
4444
}

0 commit comments

Comments
 (0)