Skip to content
Merged
Show file tree
Hide file tree
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: 2 additions & 2 deletions vms/components/fee/dimensions.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type (
// Add returns d + sum(os...).
//
// If overflow occurs, an error is returned.
func (d Dimensions) Add(os ...Dimensions) (Dimensions, error) {
func (d Dimensions) Add(os ...*Dimensions) (Dimensions, error) {
var err error
for _, o := range os {
for i := range o {
Expand All @@ -38,7 +38,7 @@ func (d Dimensions) Add(os ...Dimensions) (Dimensions, error) {
// Sub returns d - sum(os...).
//
// If underflow occurs, an error is returned.
func (d Dimensions) Sub(os ...Dimensions) (Dimensions, error) {
func (d Dimensions) Sub(os ...*Dimensions) (Dimensions, error) {
var err error
for _, o := range os {
for i := range o {
Expand Down
77 changes: 63 additions & 14 deletions vms/components/fee/dimensions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func Test_Dimensions_Add(t *testing.T) {
tests := []struct {
name string
lhs Dimensions
rhs []Dimensions
rhs []*Dimensions
expected Dimensions
expectedErr error
}{
Expand All @@ -28,7 +28,7 @@ func Test_Dimensions_Add(t *testing.T) {
DBWrite: 3,
Compute: 4,
},
rhs: []Dimensions{
rhs: []*Dimensions{
{
Bandwidth: 10,
DBRead: 20,
Expand All @@ -52,7 +52,7 @@ func Test_Dimensions_Add(t *testing.T) {
DBWrite: 3,
Compute: 4,
},
rhs: []Dimensions{
rhs: []*Dimensions{
{
Bandwidth: 10,
DBRead: 20,
Expand Down Expand Up @@ -82,7 +82,7 @@ func Test_Dimensions_Add(t *testing.T) {
DBWrite: 3,
Compute: 4,
},
rhs: []Dimensions{
rhs: []*Dimensions{
{
Bandwidth: 10,
DBRead: 20,
Expand All @@ -106,7 +106,7 @@ func Test_Dimensions_Add(t *testing.T) {
DBWrite: 3,
Compute: 4,
},
rhs: []Dimensions{
rhs: []*Dimensions{
{
Bandwidth: 10,
DBRead: 20,
Expand All @@ -130,7 +130,7 @@ func Test_Dimensions_Add(t *testing.T) {
DBWrite: math.MaxUint64,
Compute: 4,
},
rhs: []Dimensions{
rhs: []*Dimensions{
{
Bandwidth: 10,
DBRead: 20,
Expand All @@ -154,7 +154,7 @@ func Test_Dimensions_Add(t *testing.T) {
DBWrite: 3,
Compute: math.MaxUint64,
},
rhs: []Dimensions{
rhs: []*Dimensions{
{
Bandwidth: 10,
DBRead: 20,
Expand Down Expand Up @@ -186,7 +186,7 @@ func Test_Dimensions_Sub(t *testing.T) {
tests := []struct {
name string
lhs Dimensions
rhs []Dimensions
rhs []*Dimensions
expected Dimensions
expectedErr error
}{
Expand All @@ -198,7 +198,7 @@ func Test_Dimensions_Sub(t *testing.T) {
DBWrite: 33,
Compute: 44,
},
rhs: []Dimensions{
rhs: []*Dimensions{
{
Bandwidth: 1,
DBRead: 2,
Expand All @@ -222,7 +222,7 @@ func Test_Dimensions_Sub(t *testing.T) {
DBWrite: 33,
Compute: 44,
},
rhs: []Dimensions{
rhs: []*Dimensions{
{
Bandwidth: 1,
DBRead: 2,
Expand Down Expand Up @@ -252,7 +252,7 @@ func Test_Dimensions_Sub(t *testing.T) {
DBWrite: 33,
Compute: 44,
},
rhs: []Dimensions{
rhs: []*Dimensions{
{
Bandwidth: math.MaxUint64,
DBRead: 2,
Expand All @@ -276,7 +276,7 @@ func Test_Dimensions_Sub(t *testing.T) {
DBWrite: 33,
Compute: 44,
},
rhs: []Dimensions{
rhs: []*Dimensions{
{
Bandwidth: 1,
DBRead: math.MaxUint64,
Expand All @@ -300,7 +300,7 @@ func Test_Dimensions_Sub(t *testing.T) {
DBWrite: 33,
Compute: 44,
},
rhs: []Dimensions{
rhs: []*Dimensions{
{
Bandwidth: 1,
DBRead: 2,
Expand All @@ -324,7 +324,7 @@ func Test_Dimensions_Sub(t *testing.T) {
DBWrite: 33,
Compute: 44,
},
rhs: []Dimensions{
rhs: []*Dimensions{
{
Bandwidth: 1,
DBRead: 2,
Expand Down Expand Up @@ -426,3 +426,52 @@ func Test_Dimensions_ToGas(t *testing.T) {
})
}
}

func Benchmark_Dimensions_Add(b *testing.B) {
lhs := Dimensions{600, 10, 10, 1000}
rhs := []*Dimensions{
{1, 1, 1, 1},
{10, 10, 10, 10},
{100, 100, 100, 100},
{200, 200, 200, 200},
{500, 500, 500, 500},
{1_000, 1_000, 1_000, 1_000},
{10_000, 10_000, 10_000, 10_000},
}

b.Run("single", func(b *testing.B) {
for i := 0; i < b.N; i++ {
_, _ = lhs.Add(rhs[0])
}
})

b.Run("multiple", func(b *testing.B) {
for i := 0; i < b.N; i++ {
_, _ = lhs.Add(rhs[0], rhs[1], rhs[2], rhs[3], rhs[4], rhs[5], rhs[6])
}
})
}

func Benchmark_Dimensions_Sub(b *testing.B) {
lhs := Dimensions{10_000, 10_000, 10_000, 100_000}
rhs := []*Dimensions{
{1, 1, 1, 1},
{10, 10, 10, 10},
{100, 100, 100, 100},
{200, 200, 200, 200},
{500, 500, 500, 500},
{1_000, 1_000, 1_000, 1_000},
}

b.Run("single", func(b *testing.B) {
for i := 0; i < b.N; i++ {
_, _ = lhs.Sub(rhs[0])
}
})

b.Run("multiple", func(b *testing.B) {
for i := 0; i < b.N; i++ {
_, _ = lhs.Sub(rhs[0], rhs[1], rhs[2], rhs[3], rhs[4], rhs[5])
}
})
}