Sorry. some reviewers got added due to an intermediate 'buggy' merge.

Thanks

I suggest we reset this file to the original state from main branch - https://github.com/intel/llvm/blob/main/clang/test/Driver/clang-offload-bundler-standardize.c. Otherwise, there will be conflicts with the community changes. I think there should be no SYCL specific changes in this file. Am I right?

Ah.. I did not follow that we had a dedicated 'main' branch. I thought 'sycl' was our 'main' branch.
I can reset this file to be in sync with the 'main' copy.
Just curious, do we have to always try to be in sync with 'main' branch when possible?

Thanks

Just curious, do we have to always try to be in sync with 'main' branch when possible?

Yes. main is a mirror of https://github.com/llvm/llvm-project/tree/main branch and we need to the difference between main and sycl branches as minimal as possible to avoid conflicts during pulldown process. We can do this by upstreaming SYCL patches to the https://github.com/llvm/llvm-project/tree/main and avoid unnecessary changes in the sycl branch.

Just curious, do we have to always try to be in sync with 'main' branch when possible?

Yes. main is a mirror of https://github.com/llvm/llvm-project/tree/main branch and we need to the difference between main and sycl branches as minimal as possible to avoid conflicts during pulldown process. We can do this by upstreaming SYCL patches to the https://github.com/llvm/llvm-project/tree/main and avoid unnecessary changes in the sycl branch.

Thanks for the clarification @bader.
In this case, the only difference is the main branch has '// REQUIRES: asserts' added twice. May be the main branch needs to be fixed?

Thanks

Just curious, do we have to always try to be in sync with 'main' branch when possible?

Yes. main is a mirror of https://github.com/llvm/llvm-project/tree/main branch and we need to the difference between main and sycl branches as minimal as possible to avoid conflicts during pulldown process. We can do this by upstreaming SYCL patches to the https://github.com/llvm/llvm-project/tree/main and avoid unnecessary changes in the sycl branch.

Thanks for the clarification @bader. In this case, the only difference is the main branch has '// REQUIRES: asserts' added twice. May be the main branch needs to be fixed?

Thanks

That's an option as well. The final goal is the have the same version of the file in both branches.

I think this PR can be closed: the changes made here seem to be already made in the current status of the file. Please, @asudarsa close if you agree.

This pull request is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be automatically closed in 30 days.

This pull request was closed because it has been stalled for 30 days with no activity.