`src/cdef_apply.rs`: cleanup by folkertdev · Pull Request #733 · memorysafety/rav1d

folkertdev · 2024-02-07T21:25:08Z

Besides cleanup, this also fixes bugs in slice::from_raw_parts(_mut) calls in BD::pixel_copys introduced during bitdepth deduplication.

can be reviewed commit-by-commit.

these PRs get pretty large and have many unrelated changes. Would stacked PRs easier to review?

I'll leave some specific notes/questions in inline comments.

src/cdef.rs

src/cdef_apply.rs

folkertdev · 2024-02-07T21:36:02Z

src/cdef_apply.rs

-                            current_block_84 = 17075014677070940716;
+                            st_y = false;
                        } else {
-                            current_block_84 = 17728966195399430138;
+                            st_y = true;


the issue #700 mentions "cleaning up the state machine control flow". Is this sufficient?

It's not quite the goto that C inserts but I'm assuming that this results in a direct branch in practice.

As long as the current_block_* ugliness is gone and it's semantically equivalent to the C, it should be good. Let me check more closely.

ee538a8 does exactly that. None of the other commits touch the control flow.

So ee538a8 looks like good itself; it translates the state machines as they were transpiled quite nicely. The original gotos in the C source are different, though, and I think some of them got translated into extra, large ifs and stuff like that. Ideally I think we want to match the C as reasonably as possible, though your way is a very clean solution, too. So for this PR, it's definitely good, a significant improvement. We should look into matching the C gotos structure as much as possible, though. It doesn't have to match completely, but following its general structure is good, as it helps a lot with any backports.

folkertdev · 2024-02-07T21:37:57Z

src/cdef_apply.rs

-    let f: *mut Rav1dFrameContext = (*tc).f as *mut Rav1dFrameContext;
-    let bitdepth_min_8 = if 16 == 8 {
-        0 as c_int
+    let f: *mut Rav1dFrameContext = tc.f as *mut Rav1dFrameContext;


I didn't really want to add more to this PR but I think at this point this could be a proper reference. #728 gets its hands on a &Rav1dFrameContext

kkysen · 2024-02-08T01:29:04Z

these PRs get pretty large and have many unrelated changes. Would stacked PRs easier to review?

Yeah, stacked PRs work great! I've been using them a lot. As long as the stack doesn't grow super long or branch a lot (a linear stack is usually easier for me).

kkysen

Reviewed most of it, but I'm still checking some more things, like the goto state machine.

src/cdef.rs

src/cdef_apply.rs

kkysen · 2024-02-08T02:44:52Z

src/cdef_apply.rs

-                            current_block_84 = 17075014677070940716;
+                            st_y = false;
                        } else {
-                            current_block_84 = 17728966195399430138;
+                            st_y = true;


As long as the current_block_* ugliness is gone and it's semantically equivalent to the C, it should be good. Let me check more closely.

src/cdef.rs

src/cdef_apply.rs

Co-authored-by: Khyber Sen <kkysen@gmail.com>

src/cdef_apply.rs

kkysen · 2024-02-12T08:31:52Z

src/cdef_apply.rs

-            slice::from_raw_parts_mut(
-                *dst.offset(y_stride as isize) as *mut BD::Pixel,
-                (-2 * y_stride) as usize,
-            ),
-            slice::from_raw_parts(
-                *src.offset((7 as isize * y_stride) as isize) as *const BD::Pixel,
-                (-2 * y_stride) as usize,
-            ),
-            (-2 * y_stride) as usize,
+            slice::from_raw_parts_mut(dst[0].offset(y_stride), len),
+            slice::from_raw_parts(src[0].offset(7 * y_stride), len),


I think these (other similar ones, too) were mistakenly mistranslated before, as src and dst are offset first and then dereferened, vs. dereferenced/[0]ed first, and then offset. Your way looks correct so all is good here. I'll add to the PR description that this bug is fixed as well. And thanks for catching and fixing this.

kkysen

This basically all LGTM now besides dst should be an array in fn backup2lines and one other suggestion (though not too important).

Co-authored-by: Khyber Sen <kkysen@gmail.com>

builds on #733

folkertdev commented Feb 7, 2024

View reviewed changes

kkysen requested changes Feb 8, 2024

View reviewed changes

kkysen changed the title ~~src/cdef_apply.rs cleanup~~ src/cdef_apply.rs: cleanup Feb 8, 2024

folkertdev force-pushed the cdef-apply-cleanup branch from 5b1f305 to bf9a325 Compare February 8, 2024 09:23

kkysen reviewed Feb 8, 2024

View reviewed changes

src/cdef.rs Outdated Show resolved Hide resolved

kkysen reviewed Feb 8, 2024

View reviewed changes

src/cdef_apply.rs Outdated Show resolved Hide resolved

folkertdev and others added 21 commits February 11, 2024 20:50

while loops -> for loops

3dcce25

layout casts

20a270d

cleanup backup2lines

eead9b4

cleanup backup2x8

3e01bc0

remove some integer casts

0dfd712

pass p as a array reference

3b58608

pass tc as mutable reference

ca0a62e

pass stride as array reference

a10f5cb

cleanup state machine control flow

650a1dc

rename static

bf7a8fd

remove casts

b805afc

clean up top & bot assignments

a36d43e

clean up array updates

3c62f20

remove casts

73226f3

make last_skip a bool

ef5f470

bitflags! for CdefEdgeFlags

dc594df

bitflags! for Backup2x8Flags

2739b70

Apply suggestions from code review

11fb77b

Co-authored-by: Khyber Sen <kkysen@gmail.com>

clean up CdefEdgeFlags definition and use

bdc61bc

shorten bitflag constant names

5f467d4

clean up ugly bitwise logic

f9118b7

folkertdev force-pushed the cdef-apply-cleanup branch from c16440b to f9118b7 Compare February 11, 2024 19:52

folkertdev mentioned this pull request Feb 11, 2024

src/cdef_apply.rs: more cleanup #738

Merged

kkysen reviewed Feb 12, 2024

View reviewed changes

src/cdef_apply.rs Outdated Show resolved Hide resolved

kkysen reviewed Feb 12, 2024

View reviewed changes

src/cdef_apply.rs Outdated Show resolved Hide resolved

kkysen reviewed Feb 12, 2024

View reviewed changes

kkysen requested changes Feb 12, 2024

View reviewed changes

folkertdev and others added 2 commits February 12, 2024 09:38

pass dst as an array

6c459fc

Co-authored-by: Khyber Sen <kkysen@gmail.com>

use unsigned_abs to calculate len

ecdb77c

kkysen approved these changes Feb 12, 2024

View reviewed changes

kkysen merged commit 97371dc into main Feb 12, 2024

kkysen deleted the cdef-apply-cleanup branch February 12, 2024 22:38

kkysen added a commit that referenced this pull request Feb 12, 2024

src/cdef_apply.rs: more cleanup (#738)

66eeba1

builds on #733

kkysen mentioned this pull request Feb 13, 2024

struct Rav1dFrameContext: Remove excess mutability and pointers from uses #741

Merged

randomPoison mentioned this pull request Mar 18, 2024

Cleanup c2rust output in cdef_apply.rs #700

Closed

4 tasks

Conversation

folkertdev commented Feb 7, 2024 • edited by kkysen Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

folkertdev Feb 7, 2024

Choose a reason for hiding this comment

Uh oh!

kkysen Feb 8, 2024

Choose a reason for hiding this comment

Uh oh!

folkertdev Feb 8, 2024

Choose a reason for hiding this comment

Uh oh!

kkysen Feb 12, 2024

Choose a reason for hiding this comment

Uh oh!

folkertdev Feb 7, 2024

Choose a reason for hiding this comment

Uh oh!

kkysen commented Feb 8, 2024

Uh oh!

kkysen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kkysen Feb 8, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kkysen Feb 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kkysen left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

folkertdev commented Feb 7, 2024 •

edited by kkysen

Loading

kkysen Feb 12, 2024 •

edited

Loading