Open
Conversation
LegNeato
commented
Mar 7, 2026
| _args: &[OperandRef<'tcx, Self::Value>], | ||
| _is_cleanup: bool, | ||
| ) -> Self::Value { | ||
| bug!("LLVM intrinsic call not supported in SPIR-V backend: {instance:?}") |
Collaborator
Author
There was a problem hiding this comment.
I think we want to use this rather than our own home-grown replacements, but didn't want to do it in this PR.
LegNeato
force-pushed
the
pr-542-latest-nightly-refresh
branch
from
14cdf92 to
6434ab8
Compare
Contributor
|
|
Contributor
|
Tried to update with a patched Details |
Open
Collaborator
Author
|
Cool, I'll take a look. There were some changes in this area. |
fee1-dead
requested changes
Mar 9, 2026
Collaborator
There was a problem hiding this comment.
I wonder whether this is still needed? After #148789, we can simply detect Arguments::from_str if the argument is a const str.
Collaborator
Author
There was a problem hiding this comment.
panic and panic_nounwind use Arguments::from_str. But panic_display / unreachable_display still go through format_args and panic_bounds_check also formats dynamic values. So I think we need both.
|
|
||
| let value = match name { | ||
| sym::likely | sym::unlikely => { | ||
| _ if name == sym::unlikely || name.as_str() == "likely" => { |
Collaborator
There was a problem hiding this comment.
Is there any reason for this change?
Collaborator
Author
There was a problem hiding this comment.
sym::likely was removed, now checking it a different way.
LegNeato
force-pushed
the
pr-542-latest-nightly-refresh
branch
from
2fe48e0 to
db063f6
Compare
Collaborator
Author
|
@nazar-pc I think what you saw should be fixed. |
Contributor
|
Yes, clippy is happy now, tests are passing too |
fee1-dead
requested changes
Mar 13, 2026
Comment on lines
+256
to
262
| let _pointee = match self.lookup_type(ty) { | ||
| SpirvType::Pointer { pointee } => pointee, | ||
| other => self.tcx.dcx().fatal(format!( | ||
| "GlobalAlloc::Memory type not implemented: {}", | ||
| other.debug(ty, self) | ||
| )), | ||
| }; |
Collaborator
There was a problem hiding this comment.
Seems odd to keep this if this isn't being used anymore.
Comment on lines
+280
to
286
| let _pointee = match self.lookup_type(ty) { | ||
| SpirvType::Pointer { pointee } => pointee, | ||
| other => self.tcx.dcx().fatal(format!( | ||
| "GlobalAlloc::VTable type not implemented: {}", | ||
| other.debug(ty, self) | ||
| )), | ||
| }; |
Comment on lines
+360
to
+363
| let alloc_size = alloc.inner().size(); | ||
| if alloc_size.bytes() % elem_size.bytes() != 0 { | ||
| return None; | ||
| } |
Collaborator
There was a problem hiding this comment.
This would be an error right? Would it make sense to silently do nothing here?
Comment on lines
+145
to
146
| #[allow(deprecated)] | ||
| let attrs = AggregatedSpirvAttributes::parse(self, self.tcx.get_all_attrs(def_id)); |
Collaborator
There was a problem hiding this comment.
Maybe use get_attrs_by_path?
Comment on lines
86
to
+108
| @@ -86,6 +101,12 @@ pub(crate) fn provide(providers: &mut Providers) { | |||
| arg.mode = PassMode::Ignore; | |||
| } | |||
|
|
|||
| // SPIR-V backend lowers arguments by-value and cannot handle | |||
| // backend-specific indirection/casts at this layer. | |||
| if matches!(arg.mode, PassMode::Cast { .. } | PassMode::Indirect { .. }) { | |||
| arg.mode = PassMode::Direct(ArgAttributes::new()); | |||
| } | |||
Collaborator
There was a problem hiding this comment.
There's an make_direct_deprecated above this here. Seems to be duplication?
Comment on lines
888
to
902
| // FIXME(eddyb) it should be possible to arena-allocate a | ||
| // `&str` directly, but it would require upstream changes, | ||
| // and strings are handled by string interning in `rustc`. | ||
| fn arena_alloc_slice<'tcx, T: Copy>( | ||
| dropless_arena: &'tcx DroplessArena, | ||
| xs: &[T], | ||
| ) -> &'tcx [T] { | ||
| if xs.is_empty() { | ||
| &[] | ||
| } else { | ||
| dropless_arena.alloc_slice(xs) | ||
| } | ||
| } | ||
| str::from_utf8(arena_alloc_slice(self.dropless_arena, file_name.as_bytes())) | ||
| .unwrap() |
Collaborator
There was a problem hiding this comment.
| #![feature(box_patterns)] | ||
| #![feature(file_buffered)] | ||
| #![feature(if_let_guard)] | ||
| #![cfg_attr(bootstrap, feature(if_let_guard))] |
Collaborator
There was a problem hiding this comment.
I don't think rustc_codegen_spirv ever needs cfg(bootstrap). Should just remove the features that are stabilized?
| #![feature(string_from_utf8_lossy_owned)] | ||
| #![feature(trait_alias)] | ||
| #![feature(try_blocks)] | ||
| #![cfg_attr(rustc_codegen_spirv_disable_pqp_cg_ssa, allow(unused_features))] |
Collaborator
There was a problem hiding this comment.
Might need some elaboration here, which are unused features if we disable pqp_cg_ssa? Would it be fine to cfg those features instead?
Comment on lines
+322
to
+329
| fn target_machine_factory( | ||
| &self, | ||
| _sess: &Session, | ||
| _opt_level: config::OptLevel, | ||
| _target_features: &[String], | ||
| ) -> TargetMachineFactoryFn<Self> { | ||
| Arc::new(|_, _| ()) | ||
| } |
Collaborator
There was a problem hiding this comment.
This should be put at the bottom of the trait impl as an uninteresting method
| fs::write(out_dir.join("pqp_cg_ssa.rs"), pqp_cg_ssa_top_level)?; | ||
|
|
||
| println!("cargo::rustc-check-cfg=cfg(rustc_codegen_spirv_disable_pqp_cg_ssa)"); | ||
| println!("cargo::rustc-check-cfg=cfg(bootstrap)"); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Requires #542